diff options
| author | Daniel Mueller <deso@posteo.net> | 2018-01-15 09:30:24 -0800 |
|---|---|---|
| committer | Daniel Mueller <deso@posteo.net> | 2018-01-15 09:30:24 -0800 |
| commit | d8a58488bd56ef9c09e167173124c3519bc7405d (patch) | |
| tree | f52c843b4862a8ce80b3912805638be5846166fc /libc/ci/docker/arm-linux-androideabi | |
| parent | 7e6a449f276cd85ebd9201ef1a62aff3bc4d1595 (diff) | |
| download | nitrocli-d8a58488bd56ef9c09e167173124c3519bc7405d.tar.gz nitrocli-d8a58488bd56ef9c09e167173124c3519bc7405d.tar.bz2 | |
Update libc crate to 0.2.36
Import subrepo libc/:libc at 16a0f4a3d6c836f88f50c58f5d0a74a32cbf0193
Diffstat (limited to 'libc/ci/docker/arm-linux-androideabi')
| -rw-r--r-- | libc/ci/docker/arm-linux-androideabi/Dockerfile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/ci/docker/arm-linux-androideabi/Dockerfile b/libc/ci/docker/arm-linux-androideabi/Dockerfile index 554f078..a3fc64b 100644 --- a/libc/ci/docker/arm-linux-androideabi/Dockerfile +++ b/libc/ci/docker/arm-linux-androideabi/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_ARM_LINUX_ANDROIDEABI_LINKER=arm-linux-androideabi-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 @arm -no-window & \ + "SHELL=/bin/dash /android/sdk/emulator/emulator @arm -no-window & \ rustc /tmp/runtest.rs -o /tmp/runtest && \ exec \"$@\"", \ "--" \ |