New upstream version 1.23.0+dfsg1

[rustc.git] / src / vendor / libc / ci / docker / aarch64-linux-android / Dockerfile

diff --git a/src/vendor/libc/ci/docker/aarch64-linux-android/Dockerfile b/src/vendor/libc/ci/docker/aarch64-linux-android/Dockerfile
index 345540a3f07759aec0136903c0c04f53f6a29f7b..5fc83aadb333d6d1e7e841fd29d849104112b34d 100644 (file)
--- a/src/vendor/libc/ci/docker/aarch64-linux-android/Dockerfile
+++ b/src/vendor/libc/ci/docker/aarch64-linux-android/Dockerfile
@@ -25,7 +25,7 @@ RUN sh /android/android-install-ndk.sh $ANDROID_ARCH
 RUN sh /android/android-install-sdk.sh $ANDROID_ARCH
 RUN mv /root/.android /tmp
 RUN chmod 777 -R /tmp/.android
-RUN chmod 755 /android/sdk/tools/* /android/sdk/tools/qemu/linux-x86_64/*
+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 \
@@ -38,7 +38,7 @@ ENTRYPOINT [ \
   "-c", \
   # set SHELL so android can detect a 64bits system, see
   # http://stackoverflow.com/a/41789144
-  "SHELL=/bin/dash emulator @aarch64 -no-window & \
+  "SHELL=/bin/dash /android/sdk/emulator/emulator @aarch64 -no-window & \
    rustc /tmp/runtest.rs -o /tmp/runtest && \
    exec \"$@\"", \
   "--" \