Use correct PATH for x86_64-android

Author: workingjubilee

ci/docker/x86_64-linux-android/Dockerfile

@@ -21,9 +21,9 @@ RUN sh /android/android-install-ndk.sh
 COPY android-sysimage.sh /android/
 RUN bash /android/android-sysimage.sh x86_64 x86_64-24_r07.zip
 
-ENV PATH=$PATH:/rust/bin:/android/ndk-$ANDROID_ARCH/bin \
-    CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android-clang \
-    CC_x86_64_linux_android=x86_64-linux-android-clang \
-    CXX_x86_64_linux_android=x86_64-linux-android-clang++ \
-    OBJDUMP=x86_64-linux-android-objdump \
+ENV PATH=$PATH:/rust/bin:/android/ndk/toolchains/llvm/prebuilt/linux-x86_64/bin \
+    CARGO_TARGET_X86_64_LINUX_ANDROID_LINKER=x86_64-linux-android21-clang \
+    CC_x86_64_linux_android=x86_64-linux-android21-clang \
+    CXX_x86_64_linux_android=x86_64-linux-android21-clang++ \
+    OBJDUMP=llvm-objdump \
     HOME=/tmp