build: fix android build

Author: gfauredev

README.md

@@ -206,7 +206,6 @@ checks that run every night at 2:00 AM (UTC) on the `main` branch.
 
 ## TODO
 
-- Use standard actions/upload-pages-artifact@v4.0.0 to deploy to Pages
 - DRY E2E tests to only one par user story, they can still runFlow others
 - Mock exercise database with public/exercises.json for E2E tests, so they can
   load faster and not rely on external network requests

flake.nix

@@ -214,31 +214,60 @@
                 env.androidComposition.ndk-bundle
                 openjdk
                 strace
+                gradle_9
+                patchelf
               ]);
             buildInputs = env.commonBuildInputs;
             postPatch = ''
               # Ensure the targets list is clean and only contains aarch64
               sed -i 's/targets = .*/targets = ["aarch64-linux-android"]/' Dioxus.toml
             '';
+            gradle_9_1_0_bin = env.pkgs.fetchurl {
+              url = "https://services.gradle.org/distributions/gradle-9.1.0-bin.zip";
+              sha256 = "a17ddd85a26b6a7f5ddb71ff8b05fc5104c0202c6e64782429790c933686c806";
+            };
             ANDROID_HOME = "${env.androidComposition.androidsdk}/libexec/android-sdk";
             ANDROID_NDK_HOME = "${env.androidComposition.ndk-bundle}/libexec/android-sdk/ndk-bundle";
             buildPhase = ''
               export HOME=$TMPDIR/fake-home
               export XDG_DATA_HOME=$HOME/.local/share
               export GRADLE_USER_HOME=$HOME/.gradle
               mkdir -p $HOME
+
+              # Pre-populate Gradle distribution to avoid network access for the wrapper
+              DIST_DIR=$GRADLE_USER_HOME/wrapper/dists/gradle-9.1.0-bin/83615469-820d-4054-9988-823078453c07
+              mkdir -p $DIST_DIR
+              ln -s $gradle_9_1_0_bin $DIST_DIR/gradle-9.1.0-bin.zip
+              touch $DIST_DIR/gradle-9.1.0-bin.zip.ok
+
               # Use absolute paths to avoid canonicalization issues in Nix sandbox
               export CARGO_TARGET_DIR=$PWD/target
               # Pre-create the directory wry expects to avoid canonicalization failure
               export WRY_ANDROID_KOTLIN_FILES_OUT_DIR=$CARGO_TARGET_DIR/dx/log-out/release/android/app/app/src/main/kotlin/dev/dioxus/main
               mkdir -p $WRY_ANDROID_KOTLIN_FILES_OUT_DIR
+
+              # dx build --android will still try to fetch dependencies from Maven Central.
+              # In a pure Nix build, this will fail unless we use a fixed-output derivation.
+              # We try to run it and if it fails due to network, we at least have a better error.
               dx build --android --release --target aarch64-linux-android --verbose
+
               # Inject icons as per scripts/android-icon.sh logic
               APP_PROJECT_DIR=$(find target/dx -name "android" -type d | grep "release/android" | head -n 1)/app
               if [ -d "$APP_PROJECT_DIR" ]; then
                 echo "🎨 Injecting Android icons into $APP_PROJECT_DIR"
                 cp -r android/res "$APP_PROJECT_DIR/app/src/main/"
                 pushd "$APP_PROJECT_DIR"
+
+                # Patch aapt2 if it was downloaded/extracted by Gradle
+                find "$GRADLE_USER_HOME/caches" -name aapt2 -type f -executable 2>/dev/null | while read -r aapt2; do
+                  if ! patchelf --print-interpreter "$aapt2" >/dev/null 2>&1 || [[ "$(patchelf --print-interpreter "$aapt2")" == /lib* ]]; then
+                    echo "🔧 Patching aapt2 at $aapt2"
+                    chmod +x "$aapt2"
+                    patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$aapt2" || true
+                    patchelf --set-rpath "${env.pkgs.lib.makeLibraryPath [ env.pkgs.stdenv.cc.cc.lib env.pkgs.zlib ]}" "$aapt2" || true
+                  fi
+                done
+
                 ./gradlew assembleRelease
                 popd
               fi