Use new aarch64-android Dockerfile

Author: workingjubilee

ci/docker/aarch64-linux-android/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:16.04
+FROM ubuntu:20.04
 
 RUN dpkg --add-architecture i386 && \
     apt-get update && \
@@ -20,16 +20,18 @@ WORKDIR /android/
 COPY android* /android/
 
 ENV ANDROID_ARCH=aarch64
-ENV PATH=$PATH:/android/ndk-$ANDROID_ARCH/bin:/android/sdk/tools:/android/sdk/platform-tools
 
-RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
+RUN sh /android/android-install-ndk.sh
+ENV PATH=$PATH:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin
 RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
+ENV PATH=$PATH:/android/sdk/tools:/android/sdk/platform-tools
+
 RUN mv /root/.android /tmp
 RUN chmod 777 -R /tmp/.android
 RUN chmod 755 /android/sdk/tools/* /android/sdk/emulator/qemu/linux-x86_64/*
 
 ENV PATH=$PATH:/rust/bin \
-    CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android-gcc \
+    CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER=aarch64-linux-android21-clang \
     CARGO_TARGET_AARCH64_LINUX_ANDROID_RUNNER=/tmp/runtest \
     OBJDUMP=aarch64-linux-android-objdump \
     HOME=/tmp