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

Differential Revision: https://phabricator.services.mozilla.com/D202185
This commit is contained in:
Ryan VanderMeulen 2024-02-20 14:10:06 +00:00
Родитель c265adb0a2
Коммит 12fedecb07
2 изменённых файлов: 16 добавлений и 2 удалений

Просмотреть файл

@ -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

Просмотреть файл

@ -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