diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2022-06-21 15:36:46 +0200 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2022-06-23 06:50:20 +0200 |
| commit | 65f50d4d223c71478db39c3e62f19cfa368315c1 (patch) | |
| tree | b940db6c08d3a554ea6c977b4f1ba1bb4fb53ec9 | |
| parent | f8551472dc46f8503a44896b3b2e6274605d5cb0 (diff) | |
Also let Linux Android developer build use configure
Pick-to: 6.3 6.4
Change-Id: I31bfab26a28aa60354608dfe6531d9605f556c33
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Toni Saario <toni.saario@qt.io>
| -rw-r--r-- | coin/platform_configs/linux_android_tests_developer.yaml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index d5f54348..4bc125ba 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -7,9 +7,10 @@ Configurations: Compiler: 'GCC' Target compiler: 'Clang' Platform dependency: 'RHEL-8.4-host' - Features: ['Packaging', 'Sccache', 'AndroidTestRun'] + Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure'] Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-DQT_BUILD_EXAMPLES=OFF -DFEATURE_developer_build=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_ROOT}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}}', + 'TARGET_CONFIGURE_ARGS=-nomake examples -debug -developer-build -android-ndk {{.Env.ANDROID_NDK_ROOT}} -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}}', 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', 'CONAN_INSTALL_DIR={{.InstallDir}}/target', 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', |