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

Update Android Automotive emulator image to AAOS13

Browse Source 
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
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'
]