diff options
Diffstat (limited to 'coin/platform_configs/cmake_platforms_target_android.yaml')
-rw-r--r-- | coin/platform_configs/cmake_platforms_target_android.yaml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index b758abd3..19039c66 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -36,7 +36,7 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - - Id: 'android-x86-on-linux' + Id: 'android-6-x86-on-linux' Template: 'qtci-linux-RHEL-8.6-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' @@ -54,19 +54,20 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - - Id: 'android-x86_64-on-linux' + Id: 'android-13-x86_64-on-linux' Template: 'qtci-linux-RHEL-8.6-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'rhel-8.6' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] + 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_64', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', + 'ANDROID_EMULATOR=@emulator_x86_64_api_33' ] |