diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-12-14 12:28:44 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2022-11-09 06:08:17 +0000 |
| commit | b7ea626a07b85b7e4d0292db412e39f8def78b65 (patch) | |
| tree | 05ea2f7dc50a50b48ea0cee18008689992697b1a /coin/provisioning | |
| parent | 4a6f43ed8d4abdd4e862a65aded02a8f000d7238 (diff) | |
Add Android 12 emulator for CI testing
Add Android 12 emulator to make sure tests are verified
on a recent Android release. Android 12 has only x64 emulator
version from sdkmanager and x86_64 is better in any case.
This patch only adds the emulator, but doesn't enable its use,
that is done under another patch.
Task-number: QTQAINFRA-4748
Task-number: QTQAINFRA-4733
Change-Id: Ic1569fb1afa5b2d02e6eadea1d9a8eac0a378d98
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 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index d6850239..dba2a62a 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -155,8 +155,8 @@ 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" \ - | 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 "Checking the contents of Android SDK again..." @@ -165,6 +165,9 @@ 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 "Install $sdkApiLevelAutomovie $androidAutomotive" DownloadURL "$androidAutomotive11Url" "$androidAutomotive11Url" "$android11Sha" \ "/tmp/${sdkApiLevelAutomovie}_automotive.tar.gz" |