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:
commit
c438c1fb39
|
@ -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 \
|
||||
|
|
|
@ -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 "$@"
|
||||
|
|
Loading…
Reference in New Issue