aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAssam Boudjelthia <assam.boudjelthia@qt.io>2024-03-26 11:46:15 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2024-04-05 18:02:03 +0000
commit715e9f618d077af4934c3a8c0062de35b598abd7 (patch)
tree350e9a66de216b1d4e85142255b3860a0040c073
parent6b5bbaac15a029a38b93f98fe4cc800e19e3a4e9 (diff)
Coin:Android: update emulator version to 34.1.19
Update to latest (as of now) Android emulator version 34.1.19, which might solve Vulkan crashes on some CI tests. Pick-to: 6.6 6.5 Task-number: QTQAINFRA-5971 Change-Id: Ic81158f44ac5c922bfdbe6f5c04900234e063615 Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io> (cherry picked from commit a9f16c0abd79b4ea09db941d9b2e53cc64e7f630) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rwxr-xr-xcoin/provisioning/common/linux/android_linux.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh
index 1adc4efc..39a7ed0d 100755
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -132,12 +132,12 @@ cd "$sdkTargetFolder/cmdline-tools/tools/bin"
./sdkmanager --install "emulator" --sdk_root="$sdkTargetFolder" \
| eval "$sdkmanager_no_progress_bar_cmd"
-echo "Download and unzip Android Emulator version 32.1.15"
-emulatorFileName="emulator-linux_x64-10696886.zip"
+echo "Download and unzip Android Emulator version 34.1.19"
+emulatorFileName="emulator-linux_x64-11525734.zip"
emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName"
emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName"
emulatorTargetFile="$sdkTargetFolder/$emulatorFileName"
-emulatorSha1="b78f4d2c22d6aa5ca83d26ccb68cbf885a273888"
+emulatorSha1="d6cc94109b081c5f6042dcb71a453144f7e62ce7"
DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile"
echo "Unzipping the Android Emulator to '$sdkTargetFolder'"
sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder"