chore(git): add android cargo build

Author: K-Constantine

Dockerfile

@@ -1,28 +1,24 @@
 FROM ubuntu:22.04
 
-# Set environment variables for the Android SDK and NDK, and the API level.
-ENV ANDROID_API_LEVEL="22"
+# Environment setup
+ENV ANDROID_API_LEVEL=22
 ENV ANDROID_NDK_VERSION=r22
-ENV ANDROID_SDK_ROOT="/usr/lib/android-sdk"
-ENV ANDROID_HOME="/usr/lib/android-sdk"
-ENV ANDROID_NDK_HOME="${ANDROID_SDK_ROOT}/ndk-bundle"
-ENV ANDROID_NDK_PATH="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin"
-ENV NDK_SYSROOT="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot"
-
-# Set non-interactive mode for SDK manager.
+ENV ANDROID_SDK_ROOT=/usr/lib/android-sdk
+ENV ANDROID_HOME=/usr/lib/android-sdk
+ENV ANDROID_NDK_HOME=${ANDROID_SDK_ROOT}/ndk-bundle
+ENV ANDROID_NDK_PATH=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin
+ENV NDK_SYSROOT=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/sysroot
 ENV DEBIAN_FRONTEND=noninteractive
 
 # Install dependencies
 RUN apt-get update && \
-    apt-get install -y \
-        wget curl git build-essential file unzip \
-        python3 python3-pip pkg-config openjdk-17-jdk \
-        cmake ninja-build clang && \
+    apt-get install -y wget curl git build-essential file unzip \
+    python3 python3-pip pkg-config openjdk-17-jdk \
+    cmake ninja-build clang && \
     rm -rf /var/lib/apt/lists/*
 
-# Set JAVA_HOME and update PATH
-ENV JAVA_HOME="/usr/lib/jvm/java-17-openjdk-amd64"
-ENV PATH="${PATH}:${JAVA_HOME}/bin"
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+ENV PATH=${PATH}:${JAVA_HOME}/bin
 
 # Install Android SDK command-line tools
 RUN mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/latest && \
@@ -32,45 +28,25 @@ RUN mkdir -p ${ANDROID_SDK_ROOT}/cmdline-tools/latest && \
     mv ${ANDROID_SDK_ROOT}/cmdline-tools/latest/cmdline-tools/* ${ANDROID_SDK_ROOT}/cmdline-tools/latest/ && \
     rm -rf ${ANDROID_SDK_ROOT}/cmdline-tools/latest/cmdline-tools
 
-# Add SDK tools to PATH
-ENV PATH="${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin"
+ENV PATH=${PATH}:${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin
 
-# Install Android platform, build tools, and NDK
+# Install Android SDK packages
 RUN yes | sdkmanager --licenses --sdk_root=${ANDROID_SDK_ROOT}
-RUN sdkmanager "platforms;android-${ANDROID_API_LEVEL}" "build-tools;${ANDROID_API_LEVEL}.0.0" "ndk-bundle" "cmake;3.22.1" \
-    --sdk_root=${ANDROID_SDK_ROOT}
+RUN sdkmanager "platforms;android-${ANDROID_API_LEVEL}" "build-tools;${ANDROID_API_LEVEL}.0.0" "ndk-bundle" "cmake;3.22.1" --sdk_root=${ANDROID_SDK_ROOT}
 
-# Add NDK to PATH
-ENV PATH="${ANDROID_NDK_PATH}:${PATH}"
+ENV PATH=${ANDROID_NDK_PATH}:${PATH}
 
 # Install Rust
 ENV RUSTUP_HOME=/root/.rustup
 ENV CARGO_HOME=/root/.cargo
-ENV PATH="/root/.cargo/bin:${PATH}"
+ENV PATH=/root/.cargo/bin:${PATH}
 
 RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --default-toolchain stable
-
-# Ensure stable toolchain and Android targets
-RUN rustup toolchain install stable
-RUN rustup default stable
+RUN rustup toolchain install stable && 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 ===" && \
-    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 ===" && \
-    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 (all 4 ABIs)
-RUN echo "=== SETTING UP CARGO CONFIG ===" && \
-    mkdir -p /root/.cargo && \
+# Cargo config for Android cross-compilation (4 ABIs)
+RUN mkdir -p /root/.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"
@@ -94,8 +70,7 @@ rustflags = ["-C", "link-arg=--sysroot=/usr/lib/android-sdk/ndk-bundle/toolchain
 EOF
 
 # Test with Cargo for all Android ABIs
-RUN echo "=== TESTING WITH CARGO ===" && \
-    mkdir -p src && \
+RUN mkdir -p src && \
     echo '[package]' > Cargo.toml && \
     echo 'name = "test"' >> Cargo.toml && \
     echo 'version = "0.1.0"' >> Cargo.toml && \
@@ -106,15 +81,4 @@ RUN echo "=== TESTING WITH CARGO ===" && \
         cargo build --target $TARGET --verbose; \
     done
 
-# 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}
-
-RUN echo "Test compilation successful!"
-
 CMD ["bash"]