From 3f2386f2c407b0ccb084b1e709e950efb2f379b8 Mon Sep 17 00:00:00 2001 From: Petri Virkkunen Date: Fri, 13 Oct 2023 14:20:51 +0300 Subject: [PATCH] Android: Use Android 14 Beta image instead of downloaded one After Oct 4th Google Android 14 release, few cases started to fail. Cases did not fail earlier. Earlier system images were downloaded. This change introduces system image storage to CI-files. Task-number: QTBUG-117994 Change-Id: I143691f6d87f8c9b40b1f5744164cb0d22c219c3 Reviewed-by: Assam Boudjelthia --- coin/provisioning/common/linux/android_linux.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 93d31ca0..718cfbe0 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -32,6 +32,12 @@ sdkApiLevel="android-34" toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076" ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb" ndkSha1Default=$ndkSha1Latest + +# Android 14 avd zip +android14SystemZipName="android14system_UPB5_230623_003.tar.gz" +android14SystemZipSha="9680db449516ad6212525cc53f2bc027cf8b3322" +android14SystemPath="$basePath/$android14SystemZipName" + # Android automotive sdkApiLevelAutomotive="android-33" androidAutomotive13Url="$basePath/${sdkApiLevelAutomotive}_automotive.tar.gz" @@ -124,8 +130,11 @@ echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \ | eval "$sdkmanager_no_progress_bar_cmd" echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" \ | eval "$sdkmanager_no_progress_bar_cmd" -echo "y" | ./sdkmanager --install "system-images;android-34;google_apis;x86_64" \ - | eval "$sdkmanager_no_progress_bar_cmd" + +echo "Extract stored Android 14 Beta $android14SystemZipName" +DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \ + "/tmp/$android14SystemZipName" +sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images" echo "Checking the contents of Android SDK again..." ls -l "$sdkTargetFolder"