Skip to content

Commit e851879

Browse files
committed
Bug 1869407 - Pin android emulator in android-sdk-linux fetch r=bhearsum
Differential Revision: https://phabricator.services.mozilla.com/D196104
1 parent 89bdec9 commit e851879

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

taskcluster/scripts/misc/repack-android-emulator-linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ mkdir -p $UPLOAD_DIR
1010
cd $GECKO_PATH
1111
./mach python python/mozboot/mozboot/android.py --emulator-only --no-interactive --list-packages
1212

13-
# Bug XXXX: override emulator to a known working version
13+
# Bug 1868944: override emulator to a known working version
1414
curl -L http://dl.google.com/android/repository/emulator-linux_x64-10696886.zip > /tmp/emulator.zip
1515
cd /builds/worker/.mozbuild/android-sdk-linux
1616
rm -rf emulator

taskcluster/scripts/misc/repack-android-sdk-linux.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,13 @@ mkdir -p $UPLOAD_DIR
1010
cd $GECKO_PATH
1111
./mach python python/mozboot/mozboot/android.py --artifact-mode --no-interactive --list-packages
1212

13+
# Bug 1869407: override emulator to a known working version
14+
curl -L http://dl.google.com/android/repository/emulator-linux_x64-10696886.zip > /tmp/emulator.zip
15+
cd /builds/worker/.mozbuild/android-sdk-linux
16+
rm -rf emulator
17+
unzip /tmp/emulator.zip
18+
cd $GECKO_PATH
19+
1320
tar cavf $UPLOAD_DIR/android-sdk-linux.tar.zst -C /builds/worker/.mozbuild android-sdk-linux bundletool.jar
1421

1522
ls -al $UPLOAD_DIR

0 commit comments

Comments
 (0)