From d0df6a19fa489c85bd38744c5aa8f9fa537f9286 Mon Sep 17 00:00:00 2001 From: Petri Virkkunen Date: Wed, 1 Nov 2023 15:49:07 +0200 Subject: [PATCH] Update Android Automotive emulator image on RHEL 8.8 to use AAOS12 Original patch updating QtAA emulator image to AAOS12 did not include the RHEL 8.8 configuration. Android 12 is the desired platform for most users, need to run our tests on it instead of A11. Fixes: QAA-2142 Change-Id: I0d08897cd43ae8f7e9fae084c103c66d6602e028 Reviewed-by: Assam Boudjelthia Reviewed-by: Toni Saario --- coin/platform_configs/tqtc-android-automotive.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 23cfd880..c8205fdf 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -35,18 +35,18 @@ Configurations: 'ANDROID_EMULATOR=@automotive_emulator_x86_64_api_31' ] - - Id: "automotive-android-x86-on-linux-RHEL-8.8" + Id: "automotive-android-12-x86_64-on-linux-RHEL-8.8" Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' - Target arch: 'x86' + Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.8' 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' ]