diff options
| author | bors <bors@rust-lang.org> | 2024-07-27 06:32:36 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-07-27 06:32:36 +0000 |
| commit | a6796c10a1e84b83d2f3c1eea8ea71c995290deb (patch) | |
| tree | 2e3af61e9cf97e5c33567d517ba2f5d53a1d2e64 /src/ci/docker/scripts | |
| parent | adbb89e238640c3d3279ef3efb86c7bf46295858 (diff) | |
| parent | 822286f0758bea84b798e494b5b6103d288a3221 (diff) | |
| download | rust-a6796c10a1e84b83d2f3c1eea8ea71c995290deb.tar.gz rust-a6796c10a1e84b83d2f3c1eea8ea71c995290deb.zip | |
Auto merge of #3768 - rust-lang:rustup-2024-07-27, r=RalfJung
Automatic Rustup
Diffstat (limited to 'src/ci/docker/scripts')
| -rwxr-xr-x | src/ci/docker/scripts/android-start-emulator.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/android-start-emulator.sh b/src/ci/docker/scripts/android-start-emulator.sh index 09f0d13759c..5ffb72eddb1 100755 --- a/src/ci/docker/scripts/android-start-emulator.sh +++ b/src/ci/docker/scripts/android-start-emulator.sh @@ -10,7 +10,7 @@ export SHELL=/bin/bash # the emulator date is set to unix epoch (in armeabi-v7a-18 image). Using # classic engine the emulator starts with the current date and the tests run # fine. If another image is used, this need to be evaluated again. -nohup nohup emulator @armeabi-v7a-18 \ +nohup nohup emulator @armeabi-v7a-21 \ -engine classic -no-window -partition-size 2047 0<&- &>/dev/null & exec "$@" |