From e1015f271888b8bcbca4b2c0385f802e5c876acf Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Fri, 4 Oct 2024 11:59:54 +0300 Subject: [PATCH] Android: replace Android 9 revision 9 to revision 8 as it's more stable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The current revision 9 seems to have issues that are not reproducible on other environments and even not with other ABIs like x64 or arm64. Pick-to: 6.8 Task-number: QTBUG-97650 Change-Id: I6f4827f170ea11b8aae9cc774c075fa043e4df5a Reviewed-by: Simo Fält --- coin/provisioning/common/linux/android_linux.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 127d2b7a..96b67a17 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -147,8 +147,20 @@ echo "Unzipping the Android Emulator to '$sdkTargetFolder'" sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder" rm "$emulatorTargetFile" -echo "y" | ./sdkmanager --install "system-images;android-28;google_apis;x86" \ - | eval "$sdkmanager_no_progress_bar_cmd" +echo "Download and unzip Android 9 System Image" +minVersionFileName="x86-28_r08.zip" +minVersionDestination="$sdkTargetFolder/system-images/android-28/google_apis/" +minVersionFilePath="$minVersionDestination/$minVersionFileName" +minVersionCiUrl="$basePath/system-images/google_apis/$minVersionFileName" +minVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$minVersionFileName" +minVersionSha1="41e3b854d7987a3d8b7500631dae1f1d32d3db4e" + +mkdir -p "$minVersionDestination" +DownloadURL "$minVersionCiUrl" "$minVersionUrl" "$minVersionSha1" "$minVersionFilePath" + +echo "Unzipping the Android 9 to $minVersionDestination" +sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination" +rm "$minVersionFilePath" echo "y" | ./sdkmanager --install "system-images;android-35;google_apis;x86_64" \ | eval "$sdkmanager_no_progress_bar_cmd"