lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-01 19:36:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update Android Automotive emulator image in CI to use AAOS 12

Browse Source 
Android 12 is the desired platform for most users, need to run our tests
on it instead of A11.

Task-number: QAA-1739
Change-Id: Iadfdfcbc97b062baa1c4ef6eb46e9e1af6e3478a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
(cherry picked from commit 3115ca5d17)
This commit is contained in:
Petri Virkkunen
2023-04-19 09:58:57 +03:00
parent 19454cbffd
commit 06f7447651
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
coin/platform_configs/tqtc-android-automotive.yaml
View File

@@ -19,20 +19,20 @@ Include: [
]
Configurations:
-
Id: "automotive-android-x86-on-linux"
Id: "automotive-android-12-x86_64-on-linux"
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86'
Target arch: 'x86_64'
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'rhel-8.6'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86',
'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64',
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'ANDROID_EMULATOR=@automotive_emulator_x86_api_30'
'ANDROID_EMULATOR=@automotive_emulator_x86_64_api_31'
]
-
Id: "automotive-android-x86-on-linux-RHEL-8.8"

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

@@ -70,10 +70,10 @@ toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
ndkSha1Default=$ndkSha1Latest
# Android automotive
sdkApiLevelAutomotive="android-30"
androidAutomotive11Url="$basePath/${sdkApiLevelAutomotive}_automotive.tar.gz"
sdkApiLevelAutomotive="android-31"
androidAutomotive12Url="$basePath/${sdkApiLevelAutomotive}_automotive.tar.gz"
androidAutomotive="android-automotive"
android11Sha="4a5cd2bea7ce323b724c3ff1faab13d99f9d2be9"
androidAutomotive12Sha="0b6498e0c0022c40b8bb2b275f704e6a298c04a3"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
@@ -170,11 +170,11 @@ 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 $sdkApiLevelAutomotive $androidAutomotive"
DownloadURL "$androidAutomotive11Url" "$androidAutomotive11Url" "$android11Sha" \
DownloadURL "$androidAutomotive12Url" "$androidAutomotive12Url" "$androidAutomotive12Sha" \
"/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz"
sudo tar -xzf "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz" -C $sdkTargetFolder/system-images
echo "no" | ./avdmanager create avd -n automotive_emulator_x86_api_30 -c 2048M -f \
-k "system-images;${sdkApiLevelAutomotive};${androidAutomotive};x86"
echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_31 -c 2048M -f \
-k "system-images;${sdkApiLevelAutomotive};${androidAutomotive};x86_64"
# Purely informative, show the list of avd devices
./avdmanager list avd