fix(ci): strip LD_PRELOAD on child QEMU execution and remove rename watcher

.gitea/workflows/build-apk.yaml

@@ -73,10 +73,11 @@ jobs:
         run: |
           ARCH=$(uname -m)
           if [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then
-            echo "Compiling and installing transparent QEMU execution interceptor..."
+            echo "Compiling transparent QEMU execution interceptor..."
             gcc -O2 -shared -fPIC -o /usr/local/lib/libqemu_intercept.so scripts/ci/qemu_intercept.c -ldl
-            echo "/usr/local/lib/libqemu_intercept.so" > /etc/ld.so.preload
+            echo "LD_PRELOAD=/usr/local/lib/libqemu_intercept.so" >> "$GITHUB_ENV"
-            echo "Installed transparent QEMU execution interceptor into /etc/ld.so.preload"
+            rm -f /etc/ld.so.preload
+            echo "Enabled LD_PRELOAD interceptor via GITHUB_ENV"
           fi
 
       - name: Make Gradlew Executable
@@ -100,61 +101,10 @@ jobs:
           flutter test
 
       - name: Build Universal Release APK
-        run: |
+        run: flutter build apk --release
-          ARCH=$(uname -m)
-          if [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then
-            (
-              while true; do
-                for aapt2_bin in $(find /root/.gradle /opt/android-sdk-linux -type f -name "aapt2" 2>/dev/null); do
-                  if [ -f "$aapt2_bin" ] && ! [ -f "${aapt2_bin}.orig" ]; then
-                    if head -c 4 "$aapt2_bin" 2>/dev/null | grep -q 'ELF'; then
-                      echo "Wrapping newly extracted AAPT2: $aapt2_bin"
-                      mv "$aapt2_bin" "${aapt2_bin}.orig"
-                      printf '#!/bin/sh\nexec /usr/bin/qemu-x86_64-static -L /usr/x86_64-linux-gnu "$0.orig" "$@"\n' > "$aapt2_bin"
-                      chmod +x "$aapt2_bin" "${aapt2_bin}.orig"
-                    fi
-                  fi
-                done
-                sleep 0.5
-              done
-            ) &
-            AAPT2_WATCHER_PID=$!
-            echo "AAPT2 Watcher started with PID $AAPT2_WATCHER_PID"
-          fi
-
-          flutter build apk --release
-
-          if [ -n "$AAPT2_WATCHER_PID" ]; then
-            kill "$AAPT2_WATCHER_PID" 2>/dev/null || true
-          fi
 
       - name: Build Split-per-ABI Release APKs
-        run: |
+        run: flutter build apk --release --split-per-abi
-          ARCH=$(uname -m)
-          if [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then
-            (
-              while true; do
-                for aapt2_bin in $(find /root/.gradle /opt/android-sdk-linux -type f -name "aapt2" 2>/dev/null); do
-                  if [ -f "$aapt2_bin" ] && ! [ -f "${aapt2_bin}.orig" ]; then
-                    if head -c 4 "$aapt2_bin" 2>/dev/null | grep -q 'ELF'; then
-                      echo "Wrapping newly extracted AAPT2: $aapt2_bin"
-                      mv "$aapt2_bin" "${aapt2_bin}.orig"
-                      printf '#!/bin/sh\nexec /usr/bin/qemu-x86_64-static -L /usr/x86_64-linux-gnu "$0.orig" "$@"\n' > "$aapt2_bin"
-                      chmod +x "$aapt2_bin" "${aapt2_bin}.orig"
-                    fi
-                  fi
-                done
-                sleep 0.5
-              done
-            ) &
-            AAPT2_WATCHER_PID=$!
-          fi
-
-          flutter build apk --release --split-per-abi
-
-          if [ -n "$AAPT2_WATCHER_PID" ]; then
-            kill "$AAPT2_WATCHER_PID" 2>/dev/null || true
-          fi
 
       - name: Organize Artifacts
         run: |

.github/workflows/build-apk.yaml

@@ -73,10 +73,11 @@ jobs:
         run: |
           ARCH=$(uname -m)
           if [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then
-            echo "Compiling and installing transparent QEMU execution interceptor..."
+            echo "Compiling transparent QEMU execution interceptor..."
             gcc -O2 -shared -fPIC -o /usr/local/lib/libqemu_intercept.so scripts/ci/qemu_intercept.c -ldl
-            echo "/usr/local/lib/libqemu_intercept.so" > /etc/ld.so.preload
+            echo "LD_PRELOAD=/usr/local/lib/libqemu_intercept.so" >> "$GITHUB_ENV"
-            echo "Installed transparent QEMU execution interceptor into /etc/ld.so.preload"
+            rm -f /etc/ld.so.preload
+            echo "Enabled LD_PRELOAD interceptor via GITHUB_ENV"
           fi
 
       - name: Make Gradlew Executable
@@ -100,61 +101,10 @@ jobs:
           flutter test
 
       - name: Build Universal Release APK
-        run: |
+        run: flutter build apk --release
-          ARCH=$(uname -m)
-          if [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then
-            (
-              while true; do
-                for aapt2_bin in $(find /root/.gradle /opt/android-sdk-linux -type f -name "aapt2" 2>/dev/null); do
-                  if [ -f "$aapt2_bin" ] && ! [ -f "${aapt2_bin}.orig" ]; then
-                    if head -c 4 "$aapt2_bin" 2>/dev/null | grep -q 'ELF'; then
-                      echo "Wrapping newly extracted AAPT2: $aapt2_bin"
-                      mv "$aapt2_bin" "${aapt2_bin}.orig"
-                      printf '#!/bin/sh\nexec /usr/bin/qemu-x86_64-static -L /usr/x86_64-linux-gnu "$0.orig" "$@"\n' > "$aapt2_bin"
-                      chmod +x "$aapt2_bin" "${aapt2_bin}.orig"
-                    fi
-                  fi
-                done
-                sleep 0.5
-              done
-            ) &
-            AAPT2_WATCHER_PID=$!
-            echo "AAPT2 Watcher started with PID $AAPT2_WATCHER_PID"
-          fi
-
-          flutter build apk --release
-
-          if [ -n "$AAPT2_WATCHER_PID" ]; then
-            kill "$AAPT2_WATCHER_PID" 2>/dev/null || true
-          fi
 
       - name: Build Split-per-ABI Release APKs
-        run: |
+        run: flutter build apk --release --split-per-abi
-          ARCH=$(uname -m)
-          if [ "$ARCH" = "aarch64" ] || [ "$ARCH" = "arm64" ]; then
-            (
-              while true; do
-                for aapt2_bin in $(find /root/.gradle /opt/android-sdk-linux -type f -name "aapt2" 2>/dev/null); do
-                  if [ -f "$aapt2_bin" ] && ! [ -f "${aapt2_bin}.orig" ]; then
-                    if head -c 4 "$aapt2_bin" 2>/dev/null | grep -q 'ELF'; then
-                      echo "Wrapping newly extracted AAPT2: $aapt2_bin"
-                      mv "$aapt2_bin" "${aapt2_bin}.orig"
-                      printf '#!/bin/sh\nexec /usr/bin/qemu-x86_64-static -L /usr/x86_64-linux-gnu "$0.orig" "$@"\n' > "$aapt2_bin"
-                      chmod +x "$aapt2_bin" "${aapt2_bin}.orig"
-                    fi
-                  fi
-                done
-                sleep 0.5
-              done
-            ) &
-            AAPT2_WATCHER_PID=$!
-          fi
-
-          flutter build apk --release --split-per-abi
-
-          if [ -n "$AAPT2_WATCHER_PID" ]; then
-            kill "$AAPT2_WATCHER_PID" 2>/dev/null || true
-          fi
 
       - name: Organize Artifacts
         run: |

android/build.gradle

@@ -44,51 +44,3 @@ tasks.register("clean", Delete) {
     delete rootProject.buildDir
 }
 
-// Auto-wrap x86_64 AAPT2 on ARM64 Linux hosts (e.g. CI runner) to run seamlessly via QEMU
-gradle.taskGraph.whenReady { taskGraph ->
-    String os = System.getProperty("os.name", "").toLowerCase()
-    String arch = System.getProperty("os.arch", "").toLowerCase()
-    if (os.contains("linux") && (arch.contains("aarch64") || arch.contains("arm64"))) {
-        def qemu = new File("/usr/bin/qemu-x86_64-static").exists() ? "/usr/bin/qemu-x86_64-static" : "qemu-x86_64-static"
-        def wrapAapt2 = {
-            def searchDirs = []
-            def gh = gradle.gradleUserHomeDir
-            if (gh != null && gh.exists()) {
-                def transforms = new File(gh, "caches")
-                if (transforms.exists()) searchDirs.add(transforms)
-            }
-            def sdk = new File("/opt/android-sdk-linux/build-tools")
-            if (sdk.exists()) searchDirs.add(sdk)
-            def rootGradle = new File("/root/.gradle/caches")
-            if (rootGradle.exists()) searchDirs.add(rootGradle)
-
-            searchDirs.each { dir ->
-                dir.eachFileRecurse(groovy.io.FileType.FILES) { file ->
-                    if (file.name == "aapt2" && !file.name.endsWith(".orig")) {
-                        try {
-                            byte[] header = new byte[4]
-                            file.withInputStream { is -> is.read(header) }
-                            if (header[0] == 0x7F && header[1] == 0x45 && header[2] == 0x4C && header[3] == 0x46) {
-                                def orig = new File(file.parentFile, "aapt2.orig")
-                                if (!orig.exists()) {
-                                    file.renameTo(orig)
-                                    orig.setExecutable(true)
-                                }
-                                file.text = "#!/bin/sh\nexec ${qemu} -L /usr/x86_64-linux-gnu \"\$(dirname \"\$0\")/aapt2.orig\" \"\$@\"\n"
-                                file.setExecutable(true)
-                                println "[ARM64 CI] Wrapped AAPT2 at ${file.absolutePath} with QEMU"
-                            }
-                        } catch (Exception ignored) {}
-                    }
-                }
-            }
-        }
-        taskGraph.allTasks.findAll { 
-            it.name.contains("Resource") || it.name.contains("Aapt") || it.name.contains("Package") || it.name.contains("Bundle") 
-        }.each { task ->
-            task.doFirst {
-                wrapAapt2()
-            }
-        }
-    }
-}

scripts/ci/qemu_intercept.c

@@ -22,6 +22,23 @@ static int is_x86_64_elf(const char *path) {
     return machine == 62;
 }
 
+static char **clean_env(char *const envp[]) {
+    extern char **environ;
+    char *const *src = envp ? envp : environ;
+    int count = 0;
+    while (src && src[count]) count++;
+    char **new_env = (char **)malloc((count + 1) * sizeof(char *));
+    if (!new_env) return (char **)src;
+    int j = 0;
+    for (int i = 0; i < count; i++) {
+        if (strncmp(src[i], "LD_PRELOAD=", 11) != 0) {
+            new_env[j++] = src[i];
+        }
+    }
+    new_env[j] = NULL;
+    return new_env;
+}
+
 static char **build_qemu_argv(const char *pathname, char *const argv[]) {
     int argc = 0;
     while (argv && argv[argc]) argc++;
@@ -44,7 +61,8 @@ int execve(const char *pathname, char *const argv[], char *const envp[]) {
     if (pathname && is_x86_64_elf(pathname)) {
         char **new_argv = build_qemu_argv(pathname, argv);
         if (new_argv) {
-            return real_execve("/usr/bin/qemu-x86_64-static", new_argv, envp);
+            char **clean_envp = clean_env(envp);
+            return real_execve("/usr/bin/qemu-x86_64-static", new_argv, clean_envp);
         }
     }
     return real_execve(pathname, argv, envp);
@@ -57,9 +75,10 @@ int execv(const char *pathname, char *const argv[]) {
         char **new_argv = build_qemu_argv(pathname, argv);
         if (new_argv) {
             extern char **environ;
+            char **clean_envp = clean_env(environ);
             static int (*real_execve_local)(const char *, char *const [], char *const []) = NULL;
             if (!real_execve_local) real_execve_local = (int (*)(const char *, char *const [], char *const []))dlsym(RTLD_NEXT, "execve");
-            return real_execve_local("/usr/bin/qemu-x86_64-static", new_argv, environ);
+            return real_execve_local("/usr/bin/qemu-x86_64-static", new_argv, clean_envp);
         }
     }
     return real_execv(pathname, argv);
@@ -72,9 +91,10 @@ int execvp(const char *file, char *const argv[]) {
         char **new_argv = build_qemu_argv(file, argv);
         if (new_argv) {
             extern char **environ;
+            char **clean_envp = clean_env(environ);
             static int (*real_execve_local)(const char *, char *const [], char *const []) = NULL;
             if (!real_execve_local) real_execve_local = (int (*)(const char *, char *const [], char *const []))dlsym(RTLD_NEXT, "execve");
-            return real_execve_local("/usr/bin/qemu-x86_64-static", new_argv, environ);
+            return real_execve_local("/usr/bin/qemu-x86_64-static", new_argv, clean_envp);
         }
     }
     return real_execvp(file, argv);
@@ -86,9 +106,10 @@ int execvpe(const char *file, char *const argv[], char *const envp[]) {
     if (file && is_x86_64_elf(file)) {
         char **new_argv = build_qemu_argv(file, argv);
         if (new_argv) {
+            char **clean_envp = clean_env(envp);
             static int (*real_execve_local)(const char *, char *const [], char *const []) = NULL;
             if (!real_execve_local) real_execve_local = (int (*)(const char *, char *const [], char *const []))dlsym(RTLD_NEXT, "execve");
-            return real_execve_local("/usr/bin/qemu-x86_64-static", new_argv, envp);
+            return real_execve_local("/usr/bin/qemu-x86_64-static", new_argv, clean_envp);
         }
     }
     return real_execvpe(file, argv, envp);
@@ -107,7 +128,8 @@ int posix_spawn(pid_t *pid, const char *path,
     if (path && is_x86_64_elf(path)) {
         char **new_argv = build_qemu_argv(path, argv);
         if (new_argv) {
-            return real_posix_spawn(pid, "/usr/bin/qemu-x86_64-static", file_actions, attrp, new_argv, envp);
+            char **clean_envp = clean_env(envp);
+            return real_posix_spawn(pid, "/usr/bin/qemu-x86_64-static", file_actions, attrp, new_argv, clean_envp);
         }
     }
     return real_posix_spawn(pid, path, file_actions, attrp, argv, envp);
@@ -126,13 +148,14 @@ int posix_spawnp(pid_t *pid, const char *file,
     if (file && is_x86_64_elf(file)) {
         char **new_argv = build_qemu_argv(file, argv);
         if (new_argv) {
+            char **clean_envp = clean_env(envp);
             static int (*real_posix_spawn_local)(pid_t *, const char *, const posix_spawn_file_actions_t *,
                                                 const posix_spawnattr_t *, char *const [], char *const []) = NULL;
             if (!real_posix_spawn_local) {
                 real_posix_spawn_local = (int (*)(pid_t *, const char *, const posix_spawn_file_actions_t *,
                                                  const posix_spawnattr_t *, char *const [], char *const []))dlsym(RTLD_NEXT, "posix_spawn");
             }
-            return real_posix_spawn_local(pid, "/usr/bin/qemu-x86_64-static", file_actions, attrp, new_argv, envp);
+            return real_posix_spawn_local(pid, "/usr/bin/qemu-x86_64-static", file_actions, attrp, new_argv, clean_envp);
         }
     }
     return real_posix_spawnp(pid, file, file_actions, attrp, argv, envp);