Parcourir la source

ci(build): simplify binder driver configuration in build workflow

Remove redundant Rust binder module additions and consolidate configuration changes to use perl for consistent Makefile modifications. This makes the build process more maintainable and reduces complexity.
TheWildJames il y a 9 mois
Parent
commit
8cc5c530a0
1 fichiers modifiés avec 5 ajouts et 19 suppressions
  1. 5 19
      .github/workflows/build.yml

+ 5 - 19
.github/workflows/build.yml

@@ -601,27 +601,13 @@ jobs:
           fi
           
           if [ -f common/drivers/android/binder/Makefile ]; then
-            perl -i -ne 'print unless /^\s*obj-y\s*\+=\s*binder\/\s*$/' common/drivers/android/Makefile
-          cat << 'EOF' >> common/drivers/android/Makefile
-
-          # Rust binder module
-          obj-m += rust_binder.o
-          rust_binder-$(CONFIG_ANDROID_BINDER_IPC_RUST) := \
-            binder/rust_binder_main.o \
-            binder/rust_binderfs.o \
-            binder/rust_binder_events.o \
-            binder/rust_binder_hooks.o \
-            binder/page_range_helper.o
-
-          # Rust binder dummy module
-          obj-$(CONFIG_ANDROID_BINDER_IPC_RUST_DUMMY) += rust_binder.o
-          rust_binder-$(CONFIG_ANDROID_BINDER_IPC_RUST_DUMMY) := binder/dummy.o
-          
-          EOF
+            perl -i -0777 -pe 's/\$\(\s*CONFIG_ANDROID_BINDER_IPC_RUST\s*\)/m/' common/drivers/android/binder/Makefile
+            cat common/drivers/android/Makefile
+            cat common/drivers/android/binder/Makefile
           else
-            sed -i -E 's/\$\(CONFIG_ANDROID_BINDER_IPC_RUST\)/m/g' common/drivers/android/Makefile
+            perl -i -0777 -pe 's/\$\(\s*CONFIG_ANDROID_BINDER_IPC_RUST\s*\)/m/' common/drivers/android/Makefile
+            cat common/drivers/android/Makefile
           fi
-          cat common/drivers/android/Makefile
 
       - name: Change Kernel Name
         working-directory: ${{ env.KERNEL_ROOT }}