Restore aarch64 Android build.

Author: Alexhuszagh

docker/Dockerfile.aarch64-linux-android

@@ -23,24 +23,23 @@ RUN /android-ndk.sh arm64
 ENV PATH=$PATH:/android-ndk/bin
 
 COPY android-system.sh /
-# TODO(ahuszagh) Restore
-#RUN /android-system.sh arm64
-#
-#RUN cp /android-ndk/sysroot/usr/lib/aarch64-linux-android/$ANDROID_SDK/libz.so /system/lib/
-#
-#COPY android-runner /
-#
-## Libz is distributed in the android ndk, but for some unknown reason it is not
-## found in the build process of some crates, so we explicit set the DEP_Z_ROOT
-#ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
-#    CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER="/android-runner aarch64" \
-#    CC_aarch64_linux_android=aarch64-linux-android-gcc \
-#    CXX_aarch64_linux_android=aarch64-linux-android-g++ \
-#    BINDGEN_EXTRA_CLANG_ARGS_aarch64_linux_android="--sysroot=/android-ndk/sysroot" \
-#    DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
-#    RUST_TEST_THREADS=1 \
-#    HOME=/tmp/ \
-#    TMPDIR=/tmp/ \
-#    ANDROID_DATA=/ \
-#    ANDROID_DNS_MODE=local \
-#    ANDROID_ROOT=/system
+RUN /android-system.sh arm64
+
+RUN cp /android-ndk/sysroot/usr/lib/aarch64-linux-android/$ANDROID_SDK/libz.so /system/lib/
+
+COPY android-runner /
+
+# Libz is distributed in the android ndk, but for some unknown reason it is not
+# found in the build process of some crates, so we explicit set the DEP_Z_ROOT
+ENV CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
+    CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER="/android-runner aarch64" \
+    CC_aarch64_linux_android=aarch64-linux-android-gcc \
+    CXX_aarch64_linux_android=aarch64-linux-android-g++ \
+    BINDGEN_EXTRA_CLANG_ARGS_aarch64_linux_android="--sysroot=/android-ndk/sysroot" \
+    DEP_Z_INCLUDE=/android-ndk/sysroot/usr/include/ \
+    RUST_TEST_THREADS=1 \
+    HOME=/tmp/ \
+    TMPDIR=/tmp/ \
+    ANDROID_DATA=/ \
+    ANDROID_DNS_MODE=local \
+    ANDROID_ROOT=/system

docker/android-system.sh

@@ -37,6 +37,12 @@ main() {
     # latest tested version with make: 13.0.0_r6
     local has_make=1
 
+    if [[ "${ANDROID_SYSTEM_COMPLETE}" != "1" ]] && [[ "${major_version}" -ge "12" ]]; then
+        echo "Only minimal Android builds for versions 11 or lower are supported" 1>&2
+        echo "Preliminary support is currently being worked on." 1>&2
+        exit 1
+    fi
+
     local td
     td="$(mktemp -d)"
     pushd "${td}"