diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:14:29 +0000 |
| commit | fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch) | |
| tree | 4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /taskcluster/scripts/misc/repack-android-emulator-linux.sh | |
| parent | Releasing progress-linux version 124.0.1-1~progress7.99u1. (diff) | |
| download | firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip | |
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'taskcluster/scripts/misc/repack-android-emulator-linux.sh')
| -rwxr-xr-x | taskcluster/scripts/misc/repack-android-emulator-linux.sh | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/taskcluster/scripts/misc/repack-android-emulator-linux.sh b/taskcluster/scripts/misc/repack-android-emulator-linux.sh index a9745d7a1e..277e6dff09 100755 --- a/taskcluster/scripts/misc/repack-android-emulator-linux.sh +++ b/taskcluster/scripts/misc/repack-android-emulator-linux.sh @@ -11,12 +11,19 @@ cd $GECKO_PATH ./mach python python/mozboot/mozboot/android.py --emulator-only --no-interactive --list-packages # Bug 1868944: override emulator to a known working version -curl -L http://dl.google.com/android/repository/emulator-linux_x64-10696886.zip > /tmp/emulator.zip +curl --fail -L http://dl.google.com/android/repository/emulator-linux_x64-10696886.zip > /tmp/emulator.zip cd /builds/worker/.mozbuild/android-sdk-linux rm -rf emulator unzip /tmp/emulator.zip cd $GECKO_PATH +# Bug 1880925: override platform-tools to a known working version +curl --fail -L https://dl.google.com/android/repository/platform-tools_r34.0.5-linux.zip > /tmp/platform-tools.zip +cd /builds/worker/.mozbuild/android-sdk-linux +rm -rf platform-tools +unzip /tmp/platform-tools.zip +cd $GECKO_PATH + # Remove extra files we don't need rm -rfv /builds/worker/.mozbuild/android-sdk-linux/tools mkdir /builds/worker/.mozbuild/android-sdk-linux/system-images |