chore(git): add android cargo build

Author: K-Constantine

Dockerfile

@@ -56,55 +56,65 @@ RUN rustup default stable
 RUN rustup target add aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android
 
 # Debug toolchain setup
-RUN echo "=== TOOLCHAIN DEBUG ==="
-RUN rustup show
-RUN rustup target list --installed
-RUN ls -la /root/.rustup/toolchains/*/lib/rustlib/ | grep -E "(aarch64|armv7|x86_64|i686).*android"
-RUN find /root/.rustup -name "libcore*.rlib" -path "*android*" -ls
+RUN echo "=== TOOLCHAIN DEBUG ===" && \
+    rustup show && \
+    rustup target list --installed && \
+    ls -la /root/.rustup/toolchains/*/lib/rustlib/ | grep -E "(aarch64|armv7|x86_64|i686).*android" && \
+    find /root/.rustup -name "libcore*.rlib" -path "*android*" -ls
 
 # Verify NDK libraries (especially libunwind)
-RUN echo "=== NDK LIBRARY DEBUG ==="
-RUN find ${NDK_SYSROOT} -name "libunwind*" -ls
-RUN ls -la ${NDK_SYSROOT}/usr/lib/aarch64-linux-android/${ANDROID_API_LEVEL} || echo "aarch64 API ${ANDROID_API_LEVEL} library directory not found!"
-RUN ls -la ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android* || echo "No aarch64 linkers found!"
+RUN echo "=== NDK LIBRARY DEBUG ===" && \
+    find ${NDK_SYSROOT} -name "libunwind*" -ls && \
+    ls -la ${NDK_SYSROOT}/usr/lib/aarch64-linux-android/${ANDROID_API_LEVEL} || echo "aarch64 API ${ANDROID_API_LEVEL} library directory not found!" && \
+    ls -la ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android* || echo "No aarch64 linkers found!"
 
-# Configure Cargo for Android cross-compilation
+# Configure Cargo for Android cross-compilation (all 4 ABIs)
 RUN echo "=== SETTING UP CARGO CONFIG ===" && \
-    AARCH64_CLANG=$(find ${ANDROID_NDK_HOME} -name "*aarch64-linux-android${ANDROID_API_LEVEL}-clang" -type f | head -1) && \
-    LLVM_AR=$(find ${ANDROID_NDK_HOME} -name "llvm-ar" -type f | head -1) && \
-    echo "Found binaries:" && \
-    echo "  aarch64 clang: $AARCH64_CLANG" && \
-    echo "  llvm-ar: $LLVM_AR" && \
     mkdir -p /root/.cargo && \
-    echo '[target.aarch64-linux-android]' > /root/.cargo/config.toml && \
-    echo "linker = \"$AARCH64_CLANG\"" >> /root/.cargo/config.toml && \
-    echo "ar = \"$LLVM_AR\"" >> /root/.cargo/config.toml && \
-    echo "rustflags = [\"-C\", \"link-arg=--sysroot=${NDK_SYSROOT}\", \"-C\", \"link-arg=-L${NDK_SYSROOT}/usr/lib/aarch64-linux-android\", \"-C\", \"link-arg=-L${NDK_SYSROOT}/usr/lib/aarch64-linux-android/${ANDROID_API_LEVEL}\"]" >> /root/.cargo/config.toml && \
-    echo '' >> /root/.cargo/config.toml && \
-    cat /root/.cargo/config.toml
-
-
-# Test with Cargo
+    cat > /root/.cargo/config.toml <<'EOF'
+[target.aarch64-linux-android]
+linker = "/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android22-clang"
+ar = "/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
+rustflags = ["-C", "link-arg=--sysroot=/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-C", "link-arg=-L/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/22"]
+
+[target.armv7-linux-androideabi]
+linker = "/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi22-clang"
+ar = "/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
+rustflags = ["-C", "link-arg=--sysroot=/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-C", "link-arg=-L/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/arm-linux-androideabi/22"]
+
+[target.x86_64-linux-android]
+linker = "/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/x86_64-linux-android22-clang"
+ar = "/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
+rustflags = ["-C", "link-arg=--sysroot=/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-C", "link-arg=-L/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/x86_64-linux-android/22"]
+
+[target.i686-linux-android]
+linker = "/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/i686-linux-android22-clang"
+ar = "/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar"
+rustflags = ["-C", "link-arg=--sysroot=/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot", "-C", "link-arg=-L/usr/lib/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/i686-linux-android/22"]
+EOF
+
+# Test with Cargo for all Android ABIs
 RUN echo "=== TESTING WITH CARGO ===" && \
     mkdir -p src && \
     echo '[package]' > Cargo.toml && \
     echo 'name = "test"' >> Cargo.toml && \
     echo 'version = "0.1.0"' >> Cargo.toml && \
     echo 'edition = "2021"' >> Cargo.toml && \
     echo 'fn main() { println!("Hello Android!"); }' > src/main.rs && \
-    cargo build --target x86_64-linux-android --verbose
+    for TARGET in aarch64-linux-android armv7-linux-androideabi x86_64-linux-android i686-linux-android; do \
+        echo ">>> Building for $TARGET"; \
+        cargo build --target $TARGET --verbose; \
+    done
 
-# Test direct rustc compilation
+# Test direct rustc compilation for aarch64
 RUN echo "=== TESTING WITH RUSTC ===" && \
     echo 'fn main() {}' > test.rs && \
     rustc --target aarch64-linux-android --edition 2021 test.rs \
     --sysroot ${NDK_SYSROOT} \
     -C linker=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android${ANDROID_API_LEVEL}-clang \
     -C link-arg=-L${NDK_SYSROOT}/usr/lib/aarch64-linux-android \
-    -C link-arg=-L${NDK_SYSROOT}/usr/lib/aarch64-linux-android/${ANDROID_API_LEVEL} \
-    -L ${NDK_SYSROOT}/usr/lib/x86_64-linux-android \
-    -L ${NDK_SYSROOT}/usr/lib/x86_64-linux-android/${ANDROID_API_LEVEL}
+    -C link-arg=-L${NDK_SYSROOT}/usr/lib/aarch64-linux-android/${ANDROID_API_LEVEL}
 
 RUN echo "Test compilation successful!"
 
-CMD ["bash"]
+CMD ["bash"]