From ac925212d6e64c9c5318032558be9d99192bef7e Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Mon, 28 Apr 2025 11:20:01 +0200 Subject: [PATCH] Enable QT_USE_TARGET_ANDROID_BUILD_DIR when building tests for Android x86 The option is mature enough to attempt adding full support in CI. Enable it for CI testing on Android x86 RHEL machine. Change-Id: Ib0ba96f7a30b10be64bc6df44353e10c090ec3ad Reviewed-by: Alexandru Croitor Reviewed-by: Assam Boudjelthia --- coin/platform_configs/cmake_platforms_target_android.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 8fcca436..554bf7a9 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -44,6 +44,9 @@ Configurations: 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + # We check QT_USE_TARGET_ANDROID_BUILD_DIR only in one configuration, to ensure builds + # without this option work too. + 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', 'ANDROID_EMULATOR=emulator_x86_api_28' ]