From 1544e255cb17bea0835a314bbbc7d5ba149cee56 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 5 Jun 2026 16:27:48 +0300 Subject: [PATCH] Android: update emulator to version 36.6.11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-146930 Pick-to: 6.11 6.8 Change-Id: I18983a99e351ea66b06c97feabaa7916750b8c7a Reviewed-by: Simo Fält (cherry picked from commit 8c31c162989a7e0f0fd24070a3574601f1d3145a) Reviewed-by: Qt Cherry-pick Bot --- coin/provisioning/common/linux/android_linux.sh | 7 ++++--- coin/provisioning/common/unix/android_emulator_launcher.sh | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 1eaec1d1..e8e2864e 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -161,12 +161,13 @@ 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 35.2.10" -emulatorFileName="emulator-linux_x64-12414864.zip" +echo "Download and unzip Android Emulator version 36.6.11" +# See https://developer.android.com/studio/emulator_archive +emulatorFileName="emulator-linux_x64-15507667.zip" emulatorCiUrl="https://ci-files01-hki.ci.qt.io/input/android/$emulatorFileName" emulatorUrl="http://dl.google.com/android/repository/$emulatorFileName" emulatorTargetFile="$sdkTargetFolder/$emulatorFileName" -emulatorSha1="41dd213d120f727d8c3840347d234b135793ba10" +emulatorSha1="f8d8b83cf21a04966326eb1378bacda255f63b93" DownloadURL "$emulatorCiUrl" "$emulatorUrl" "$emulatorSha1" "$emulatorTargetFile" echo "Unzipping the Android Emulator to '$sdkTargetFolder'" sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder" diff --git a/coin/provisioning/common/unix/android_emulator_launcher.sh b/coin/provisioning/common/unix/android_emulator_launcher.sh index 055a5708..a92932c9 100755 --- a/coin/provisioning/common/unix/android_emulator_launcher.sh +++ b/coin/provisioning/common/unix/android_emulator_launcher.sh @@ -112,7 +112,7 @@ do echo "Starting emulator ${AVD_NAME}, try ${counter}/${EMULATOR_MAX_RETRIES}" \ | tee "${EMULATOR_RUN_LOG_PATH}" $EMULATOR_EXEC -avd "$AVD_NAME" \ - -gpu swiftshader_indirect -no-audio $WINDOW_ARG -no-boot-anim \ + -gpu swiftshader -no-audio $WINDOW_ARG -no-boot-anim \ -cores 4 -memory 16000 -partition-size 4096 \ -detect-image-hang -restart-when-stalled -no-snapshot-save \ -no-nested-warnings -logcat '*:v' -logcat-output "${LOGCAT_PATH}" \