chore(git): add android cargo build

Author: K-Constantine

Dockerfile

@@ -79,73 +79,50 @@ RUN ls -la /root/.rustup/toolchains/*/lib/rustlib/ | grep -E "(aarch64|armv7|x86
 # Verify core libraries exist
 RUN find /root/.rustup -name "libcore*.rlib" -path "*android*" -ls
 
-# Set up the Rust configuration for Android cross-compilation (with sysroot)
-RUN echo "=== SETTING UP CARGO CONFIG WITH SYSROOT ===" && \
+# Set up the Rust configuration for Android cross-compilation (simplified approach)
+RUN echo "=== SETTING UP SIMPLIFIED CARGO CONFIG ===" && \
     AARCH64_CLANG=$(find ${ANDROID_NDK_HOME} -name "*aarch64*android*clang" -type f | head -1) && \
-    ARMV7_CLANG=$(find ${ANDROID_NDK_HOME} -name "*armv7*android*clang" -o -name "*arm*android*eabi*clang" -type f | head -1) && \
-    X86_64_CLANG=$(find ${ANDROID_NDK_HOME} -name "*x86_64*android*clang" -type f | head -1) && \
-    I686_CLANG=$(find ${ANDROID_NDK_HOME} -name "*i686*android*clang" -type f | head -1) && \
     LLVM_AR=$(find ${ANDROID_NDK_HOME} -name "llvm-ar" -type f | head -1) && \
-    NDK_SYSROOT=$(find ${ANDROID_NDK_HOME} -name "sysroot" -type d | head -1) && \
     echo "Found binaries:" && \
     echo "  aarch64: $AARCH64_CLANG" && \
-    echo "  sysroot: $NDK_SYSROOT" && \
     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 '' >> /root/.cargo/config.toml && \
-    echo '[target.armv7-linux-androideabi]' >> /root/.cargo/config.toml && \
-    echo "linker = \"$ARMV7_CLANG\"" >> /root/.cargo/config.toml && \
-    echo "ar = \"$LLVM_AR\"" >> /root/.cargo/config.toml && \
-    echo '' >> /root/.cargo/config.toml && \
-    echo '[target.x86_64-linux-android]' >> /root/.cargo/config.toml && \
-    echo "linker = \"$X86_64_CLANG\"" >> /root/.cargo/config.toml && \
-    echo "ar = \"$LLVM_AR\"" >> /root/.cargo/config.toml && \
-    echo '' >> /root/.cargo/config.toml && \
-    echo '[target.i686-linux-android]' >> /root/.cargo/config.toml && \
-    echo "linker = \"$I686_CLANG\"" >> /root/.cargo/config.toml && \
-    echo "ar = \"$LLVM_AR\"" >> /root/.cargo/config.toml
-
-# Add rustflags for sysroot to cargo config
-RUN NDK_SYSROOT=$(find ${ANDROID_NDK_HOME} -name "sysroot" -type d | head -1) && \
-    echo "" >> /root/.cargo/config.toml && \
-    echo "[target.aarch64-linux-android]" >> /root/.cargo/config.toml && \
-    echo "rustflags = [\"-C\", \"link-arg=--sysroot=$NDK_SYSROOT\"]" >> /root/.cargo/config.toml
-
-# Set environment variables with the found paths
-RUN AARCH64_CLANG=$(find ${ANDROID_NDK_HOME} -name "*aarch64*android*clang" -type f | head -1) && \
-    AARCH64_CLANGXX=$(find ${ANDROID_NDK_HOME} -name "*aarch64*android*clang++" -type f | head -1) && \
-    LLVM_AR=$(find ${ANDROID_NDK_HOME} -name "llvm-ar" -type f | head -1) && \
-    NDK_SYSROOT=$(find ${ANDROID_NDK_HOME} -name "sysroot" -type d | head -1) && \
-    echo "export CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=\"$AARCH64_CLANG\"" >> /root/.android_env && \
-    echo "export CC_aarch64_linux_android=\"$AARCH64_CLANG\"" >> /root/.android_env && \
-    echo "export CXX_aarch64_linux_android=\"$AARCH64_CLANGXX\"" >> /root/.android_env && \
-    echo "export AR_aarch64_linux_android=\"$LLVM_AR\"" >> /root/.android_env && \
-    echo "export CFLAGS_aarch64_linux_android=\"--sysroot=$NDK_SYSROOT -D__ANDROID_API__=22\"" >> /root/.android_env && \
-    echo "export CXXFLAGS_aarch64_linux_android=\"--sysroot=$NDK_SYSROOT -D__ANDROID_API__=22\"" >> /root/.android_env && \
-    cat /root/.android_env
-
-# Source the environment
-RUN . /root/.android_env
+    echo '# Let the NDK clang handle sysroot automatically' >> /root/.cargo/config.toml
+
+# Test with cargo instead of direct rustc
+RUN echo "=== TESTING WITH CARGO ===" && \
+    echo 'fn main() { println!("Hello Android!"); }' > src/main.rs && \
+    echo '[package]' > Cargo.toml && \
+    echo 'name = "test"' >> Cargo.toml && \
+    echo 'version = "0.1.0"' >> Cargo.toml && \
+    echo 'edition = "2021"' >> Cargo.toml && \
+    mkdir -p src && \
+    echo 'fn main() { println!("Hello Android!"); }' > src/main.rs && \
+    echo "Cargo config:" && \
+    cat /root/.cargo/config.toml && \
+    echo "Attempting cargo build..." && \
+    cargo build --target aarch64-linux-android --verbose 2>&1 || echo "Cargo build failed, but we got debug info"
 
 # Debug: Verify the NDK files exist
 RUN echo "=== NDK DEBUG ==="
 RUN ls -la ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/ | head -10
-RUN ls -la ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android22-clang || echo "Linker not found!"
+RUN ls -la ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android27-clang || echo "Linker not found!"
 RUN ls -la ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-ar || echo "AR not found!"
 
 # Test that our NDK linker works
-RUN ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android22-clang --version || echo "Cannot run clang!"
+RUN ${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android27-clang --version || echo "Cannot run clang!"
 
 # Test simple compilation with proper linker
 RUN echo 'fn main() {}' > test.rs
 
 # Test compilation with explicit linker (this should work now)
 RUN rustc --target aarch64-linux-android --edition 2021 test.rs \
     --sysroot $(rustc --print sysroot) \
-    -C linker=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android22-clang
+    -C linker=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/aarch64-linux-android27-clang
 
 RUN echo "Test compilation successful!"