lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-09-26 02:16:40 +08:00
Code Issues Packages Projects Releases Wiki Activity

Android: update Android 17 to latest image

Browse Source 
Update to Android 17 SDK 37.1 revision 7. The newer 37.2
revision 4 image fails to boot on the CI x86_64 emulator.

Task-number: QTBUG-146930
Change-Id: If9fe32defa505aa6150aa69bb874bb05345027ee
Reviewed-by: Ville Voutilainen <[email protected]>
(cherry picked from commit 61b2b03b78)
Reviewed-by: Qt Cherry-pick Bot <[email protected]>
This commit is contained in:
Assam Boudjelthia
2026-09-19 19:22:21 +00:00
committed by Qt Cherry-pick Bot
parent 1544e255cb
commit 34d7840724
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coin/provisioning/common/linux/android_linux.sh
+6 -6
View File
@@ -203,21 +203,21 @@ echo "Unzipping the Android 16 to $maxVersionDestination"
sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
rm "$maxVersionFilePath"
echo "Download and unzip Android 17 Beta 3 16KB System Image"
insignificantMaxVersionFileName="x86_64-ps16k-37.0_r03.zip"
echo "Download and unzip Android 17 (16KB Page Size) System Image"
insignificantMaxVersionFileName="x86_64-ps16k-37.1_r07.zip"
insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-37/google_apis_ps16k/"
insignificantMaxVersionFilePath="$insignificantMaxVersionDestination/$insignificantMaxVersionFileName"
insignificantMaxVersionCiUrl="$basePath/system_images/google_apis/$insignificantMaxVersionFileName"
insignificantMaxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$insignificantMaxVersionFileName"
insignificantMaxVersionSha1="b89a6686f9a9e9942d596bed45d422cbccb70c98"
insignificantMaxVersionSha1="88e208a83a5f0b18958275b7c1a047e931395f3f"
mkdir -p "$insignificantMaxVersionDestination"
DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath"
echo "Unzipping the Android 17 Beta3 16KB to $insignificantMaxVersionDestination"
echo "Unzipping the Android 17 (16KB Page Size) to $insignificantMaxVersionDestination"
sudo unzip -o -q "$insignificantMaxVersionFilePath" -d "$insignificantMaxVersionDestination"
# Hack to avoid SDK version bug in source.properties file, the usage of ".0" messes things for avdmanager. TODO: undo when official comes
sudo sed -i 's/AndroidVersion.ApiLevel=37.0/AndroidVersion.ApiLevel=37/g' "$insignificantMaxVersionDestination/x86_64/source.properties"
sudo sed -i 's/AndroidVersion.ApiLevel=37.1/AndroidVersion.ApiLevel=37/g' "$insignificantMaxVersionDestination/x86_64/source.properties"
rm "$insignificantMaxVersionFilePath"
echo "Checking the contents of Android SDK again..."
@@ -230,7 +230,7 @@ echo "no" | ./avdmanager create avd -n emulator_x86_64_api_36 -c 2048M -f \
-k "system-images;android-36;google_apis;x86_64"
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_37 -c 2048M -f \
-k "system-images;android-37;google_apis,page_size_16kb,ai_glasses_compatible;x86_64"
-k "system-images;android-37;google_apis,page_size_16kb;x86_64"
echo "Install maximum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMax"
DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \