Dummy commit.

Author: Alexhuszagh

docker/Dockerfile.aarch64-linux-android

@@ -22,23 +22,24 @@ RUN /android-ndk.sh arm64
 ENV PATH=$PATH:/android-ndk/bin
 
 COPY android-system.sh /
-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
+# 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

docker/android-system.sh

@@ -138,12 +138,8 @@ EOF
         python3 ./repo sync -c system/libvintf
         python3 ./repo sync -c system/sepolicy
         python3 ./repo sync -c system/tools/xsdc
-        # needed for libvintf
-        python3 ./repo sync -c test/vts
     fi
 
-
-
     case "${arch}" in
         arm)
             python3 ./repo sync "prebuilts/gcc/linux-x86/arm/arm-linux-androideabi-${gcc_version}"
@@ -175,6 +171,8 @@ EOF
     sed -i -z -e 's/cc_test {.*}//g' bionic/libc/malloc_debug/Android.bp
     sed -i -z -e 's/cc_test {.*}//g' bionic/libc/malloc_hooks/Android.bp
     sed -i -z -e 's/cc_test_host {.*}//g' bionic/tools/relocation_packer/Android.bp
+    # TODO(ahuszagh) Need to remove the necessary tests that fail.
+    #python3 ./repo sync -c test/vts
     set -e
 
     export ALLOW_MISSING_DEPENDENCIES=true