diff options
| author | bors <bors@rust-lang.org> | 2017-04-07 12:51:18 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-04-07 12:51:18 +0000 |
| commit | c438c1fb39337b7712afc58df4f1f9c5112e5cc1 (patch) | |
| tree | f74f0b2dda5c81b100e641c9279116a0a73fafdc /src | |
| parent | 4c59c92bc4d4d6e5b2b66c4cc08dd1a058283a0d (diff) | |
| parent | 113b3b46a77222fe898b0a6678af451f29a7acc4 (diff) | |
| download | rust-c438c1fb39337b7712afc58df4f1f9c5112e5cc1.tar.gz rust-c438c1fb39337b7712afc58df4f1f9c5112e5cc1.zip | |
Auto merge of #40971 - malbarbo:android-emulator-64, r=alexcrichton
Use 64 bits emulator to run android tests Also install headless jre instead of the full jre.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ci/docker/arm-android/Dockerfile | 2 | ||||
| -rwxr-xr-x | src/ci/docker/arm-android/start-emulator.sh | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/ci/docker/arm-android/Dockerfile b/src/ci/docker/arm-android/Dockerfile index 4c89ce12531..04ca6d76c55 100644 --- a/src/ci/docker/arm-android/Dockerfile +++ b/src/ci/docker/arm-android/Dockerfile @@ -13,7 +13,7 @@ RUN dpkg --add-architecture i386 && \ cmake \ unzip \ expect \ - openjdk-9-jre \ + openjdk-9-jre-headless \ sudo \ libstdc++6:i386 \ xz-utils \ diff --git a/src/ci/docker/arm-android/start-emulator.sh b/src/ci/docker/arm-android/start-emulator.sh index 24c477d87f1..4a73637e9dd 100755 --- a/src/ci/docker/arm-android/start-emulator.sh +++ b/src/ci/docker/arm-android/start-emulator.sh @@ -10,7 +10,9 @@ # except according to those terms. set -ex -ANDROID_EMULATOR_FORCE_32BIT=true \ - nohup nohup emulator @arm-18 -no-window -partition-size 2047 \ - 0<&- &>/dev/null & + +# Setting SHELL to a file instead on a symlink helps android +# emulator identify the system +export SHELL=/bin/bash +nohup nohup emulator @arm-18 -no-window -partition-size 2047 0<&- &>/dev/null & exec "$@" |