Bug 1880925 - Pin platform-tools to r34.0.5. r=releng-reviewers,jcristau

Differential Revision: https://phabricator.services.mozilla.com/D202185
dothq · Feb 20, 2024 · 12fedec · 12fedec
1 parent c265adb
commit 12fedec
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git 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

diff --git a/taskcluster/scripts/misc/repack-android-sdk-linux.sh b/taskcluster/scripts/misc/repack-android-sdk-linux.sh
@@ -11,12 +11,19 @@ cd $GECKO_PATH
 ./mach python python/mozboot/mozboot/android.py --artifact-mode --no-interactive --list-packages
 
 # Bug 1869407: 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
+
 tar cavf $UPLOAD_DIR/android-sdk-linux.tar.zst -C /builds/worker/.mozbuild android-sdk-linux bundletool.jar
 
 ls -al $UPLOAD_DIR