diff options
| author | Rami Potinkara <rami.potinkara@qt.io> | 2023-05-09 22:18:42 +0300 |
|---|---|---|
| committer | Rami Potinkara <rami.potinkara@qt.io> | 2023-05-19 07:10:39 +0000 |
| commit | b9af6ca0a2a2e8a4ed27c1c6ca64a9f705978c81 (patch) | |
| tree | 18db66105060d44d0eaa4ea94e193c5e278b682b /coin/provisioning | |
| parent | 401785e16848d51f2b29afc218a0daafe61c463b (diff) | |
Android: Android OS 13 API 33 to CI as maximum version
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 ef12163e2567dced323f524cc40e5382a4a25e76)
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/provisioning')
| -rwxr-xr-x | coin/provisioning/common/linux/android_linux.sh | 9 |
1 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 79627f0f..dbf29ea4 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -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" \ |