lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-04-21 04:16:39 +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>
This commit is contained in:
Petri Virkkunen
2023-04-19 09:58:57 +03:00
parent 6c40b6160e
commit 3115ca5d17
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,19 +17,19 @@ Include: [
] ]
Configurations: Configurations:
- -
Id: "automotive-android-x86-on-linux" Id: "automotive-android-12-x86_64-on-linux"
Template: 'qtci-linux-RHEL-8.6-x86_64-50' Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'x86' Target arch: 'x86_64'
Compiler: 'GCC' Compiler: 'GCC'
Target compiler: 'Clang' Target compiler: 'Clang'
Platform dependency: 'rhel-8.6' Platform dependency: 'rhel-8.6'
Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure']
Environment variables: [ 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}}', '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_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc',
'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86_64-clang',
'ANDROID_EMULATOR=@automotive_emulator_x86_api_30' 'ANDROID_EMULATOR=@automotive_emulator_x86_64_api_31'
] ]

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

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