qiurui
/
qt5
mirror of https://github.com/qt/qt5.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update Android Automotive emulator image to AAOS13 

Task-number: QAA-2036
Change-Id: I6f27bf9edbd5c7b4f0a3124d888e3b0ac2f48bfa
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
Petri Virkkunen 2023-08-30 14:20:50 +03:00
parent c8434c0d6f
commit 879092ecc1
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,7 @@ Include: [
]
Configurations:
-
Id: "automotive-android-12-x86_64-on-linux"
Id: "automotive-android-13-x86_64-on-linux"
Template: 'qtci-linux-RHEL-8.6-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
@ -32,10 +32,10 @@ Configurations:
'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_64_api_31'
'ANDROID_EMULATOR=automotive_emulator_x86_64_api_33'
]
-
Id: "automotive-android-12-x86_64-on-linux"
Id: "automotive-android-13-x86_64-on-linux"
Template: 'qtci-linux-RHEL-8.8-x86_64-50'
Target os: 'Android_ANY'
Target arch: 'x86_64'
@ -48,5 +48,5 @@ Configurations:
'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_64_api_31'
'ANDROID_EMULATOR=automotive_emulator_x86_64_api_33'
]

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

@ -33,10 +33,10 @@ toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"
ndkSha1Default=$ndkSha1Latest
# Android automotive
sdkApiLevelAutomotive="android-31"
androidAutomotive12Url="$basePath/${sdkApiLevelAutomotive}_automotive.tar.gz"
sdkApiLevelAutomotive="android-33"
androidAutomotive13Url="$basePath/${sdkApiLevelAutomotive}_automotive.tar.gz"
androidAutomotive="android-automotive"
androidAutomotive12Sha="0b6498e0c0022c40b8bb2b275f704e6a298c04a3"
androidAutomotive13Sha="b020a938ec46af2510047284406e9bed608cad03"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
@ -140,10 +140,10 @@ echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \
-k "system-images;android-34;google_apis;x86_64"
echo "Install $sdkApiLevelAutomotive $androidAutomotive"
DownloadURL "$androidAutomotive12Url" "$androidAutomotive12Url" "$androidAutomotive12Sha" \
DownloadURL "$androidAutomotive13Url" "$androidAutomotive13Url" "$androidAutomotive13Sha" \
"/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_64_api_31 -c 2048M -f \
echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_33 -c 2048M -f \
-k "system-images;${sdkApiLevelAutomotive};${androidAutomotive};x86_64"
# Purely informative, show the list of avd devices