OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
bors 2017-04-07 12:51:18 +00:00
parent 4c59c92bc4 113b3b46a7
commit c438c1fb39
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ci/docker/arm-android/Dockerfile
View File

@ -13,7 +13,7 @@ RUN dpkg --add-architecture i386 && \
cmake \ cmake \
unzip \ unzip \
expect \ expect \
openjdk-9-jre \ openjdk-9-jre-headless \
sudo \ sudo \
libstdc++6:i386 \ libstdc++6:i386 \
xz-utils \ xz-utils \

8
src/ci/docker/arm-android/start-emulator.sh
View File

@ -10,7 +10,9 @@
# except according to those terms. # except according to those terms.
set -ex set -ex
ANDROID_EMULATOR_FORCE_32BIT=true \
nohup nohup emulator @arm-18 -no-window -partition-size 2047 \ # Setting SHELL to a file instead on a symlink helps android
0<&- &>/dev/null & # emulator identify the system
export SHELL=/bin/bash
nohup nohup emulator @arm-18 -no-window -partition-size 2047 0<&- &>/dev/null &
exec "$@" exec "$@"