lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-18 02:06:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

Android: Android OS 13 API 33 to CI as maximum version

Browse Source 
Android 13 replaces Android 12 as max version in CI.
Android 6 kept as minimum version of Android in CI.

Task-number: QTQAINFRA-5392
Task-number: QTQAINFRA-5431
Change-Id: If85c6f63d52055e2ba95f92c154b20a6b809c7dc
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit ef12163e25)
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
This commit is contained in:
Rami Potinkara
2023-05-09 22:18:42 +03:00
parent 401785e168
commit b9af6ca0a2
44 changed files with 54 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
coin/provisioning/common/linux/android_linux.sh
View File

@@ -155,8 +155,9 @@ echo "Android NDK = $ndkVersion" >> ~/versions.txt
cd "$sdkTargetFolder/cmdline-tools/tools/bin"
./sdkmanager --install "emulator" --sdk_root=$sdkTargetFolder \
| eval $sdkmanager_no_progress_bar_cmd
echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \
"system-images;android-31;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd
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 "Checking the contents of Android SDK again..."
@@ -165,8 +166,8 @@ ls -l "$sdkTargetFolder"
echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -c 2048M -f \
-k "system-images;android-23;google_apis;x86"
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_31 -c 2048M -f \
-k "system-images;android-31;google_apis;x86_64"
echo "no" | ./avdmanager create avd -n emulator_x86_64_api_33 -c 2048M -f \
-k "system-images;android-33;google_apis;x86_64"
echo "Install $sdkApiLevelAutomovie $androidAutomotive"
DownloadURL "$androidAutomotive11Url" "$androidAutomotive11Url" "$android11Sha" \