Эх сурвалжийг харах

ci(workflows): update build conditions for ashmem exports

Modify the conditional logic for appending ashmem exports based on os_patch_level.
Also simplify the Makefile modifications by removing redundant conditions.
TheWildJames 9 сар өмнө
parent
commit
de7acd67ec

+ 26 - 9
.github/workflows/build.yml

@@ -583,7 +583,29 @@ jobs:
           fi
 
       - name: Append ashmem exports if missing
-        if: ${{ inputs.android_version == 'android16' && inputs.kernel_version == '6.12' }}
+        if: ${{ inputs.android_version == 'android16' && inputs.kernel_version == '6.12' && inputs.os_patch_level != 'lts' }}
+        working-directory: ${{ env.KERNEL_ROOT }}
+        run: |
+          FILE=common/drivers/staging/android/ashmem.c
+          if [[ -f "$FILE" ]] && ! grep -q 'is_ashmem_file' "$FILE"; then
+          cat >>"$FILE" <<'EOF'
+
+          bool is_ashmem_file(struct file *file) { return false; }
+          int ashmem_area_name(struct file *file, char *name) { return 0; }
+          long ashmem_area_size(struct file *file) { return 0; }
+          struct file *ashmem_area_vmfile(struct file *file) { return NULL; }
+          EXPORT_SYMBOL_GPL(is_ashmem_file);
+          EXPORT_SYMBOL_GPL(ashmem_area_name);
+          EXPORT_SYMBOL_GPL(ashmem_area_size);
+          EXPORT_SYMBOL_GPL(ashmem_area_vmfile);
+          EOF
+          fi
+          
+          sed -i -E 's/\$\(CONFIG_ANDROID_BINDER_IPC_RUST\)/m/g' common/drivers/android/Makefile
+          cat common/drivers/android/Makefile
+
+      - name: Append ashmem exports if missing
+        if: ${{ inputs.android_version == 'android16' && inputs.kernel_version == '6.12' && inputs.os_patch_level == 'lts' }} && false
         working-directory: ${{ env.KERNEL_ROOT }}
         run: |
           FILE=common/drivers/staging/android/ashmem.c
@@ -604,14 +626,9 @@ jobs:
           #if [[ "${{ inputs.os_patch_level }}" == "lts" ]]; then
           #  sed -i 's/^obj-y += binder\//obj-m += binder\//' common/drivers/android/Makefile
           #fi
-
-          if [[ "${{ inputs.os_patch_level }}" == "lts" ]]; then
-            sed -i -E 's/\$\(CONFIG_ANDROID_BINDER_IPC_RUST\)/m/' common/drivers/android/binder/Makefile
-            cat common/drivers/android/binder/Makefile
-          else
-            sed -i -E 's/\$\(CONFIG_ANDROID_BINDER_IPC_RUST\)/m/g' common/drivers/android/Makefile
-            cat common/drivers/android/Makefile
-          fi
+          
+          sed -i -E 's/\$\(CONFIG_ANDROID_BINDER_IPC_RUST\)/m/' common/drivers/android/binder/Makefile
+          cat common/drivers/android/binder/Makefile
 
       - name: Change Kernel Name
         working-directory: ${{ env.KERNEL_ROOT }}