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

Add Android 12 emulator for CI testing

Browse Source 
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>
This commit is contained in:
Assam Boudjelthia
2021-12-14 12:28:44 +02:00
parent 4a6f43ed8d
commit b7ea626a07
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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