From a9a7f25d7ba799e5f9c66c5c739da531c0bfb831 Mon Sep 17 00:00:00 2001 From: Elias Toivola Date: Wed, 6 Nov 2024 13:39:00 +0200 Subject: [PATCH] Android: Add a nightly target to check namespace functionality Bug reports from the nightly target are updated to the ticket. Task-number: QTQAINFRA-5945 Change-Id: I9e0622b3da4909dc72af1da8c0deb260f6cd5a3e Reviewed-by: Assam Boudjelthia --- coin/platform_configs/nightly_android.yaml | 38 ++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/coin/platform_configs/nightly_android.yaml b/coin/platform_configs/nightly_android.yaml index ae2d5420..c4e0d2c9 100644 --- a/coin/platform_configs/nightly_android.yaml +++ b/coin/platform_configs/nightly_android.yaml @@ -3,6 +3,10 @@ Include: [ cmake_platforms.yaml: [ 'rhel-8.10', 'windows-10_22h2-mingw13' + ], + cmake_platforms_target_android.yaml: [ + 'android-15-x86_64-on-linux', + 'android-9-x86-on-linux' ] ] # Android nightly to check for older (but still supported for the branch) NDKs @@ -135,3 +139,37 @@ Configurations: 'NON_QTBASE_TARGET_CMAKE_ARGS=-DQT_ADDITIONAL_HOST_PACKAGES_PREFIX_PATH=/usr/local -DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_ARM64_NDK_NIGHTLY2}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_NIGHTLY2}}' ] + +# Android nightly to check for -qtnamespace errors/issues +- + Id: 'android-15-x86_64-on-linux' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'rhel-8.10' + Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-qtnamespace TestNamespace -nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', + 'ANDROID_EMULATOR=emulator_x86_64_api_35' + ] +- + Id: 'android-9-x86-on-linux' + Template: 'qtci-linux-RHEL-8.10-x86_64-51' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'rhel-8.10' + Features: ['Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-qtnamespace TestNamespace -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', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', + 'ANDROID_EMULATOR=emulator_x86_api_28' + ]