aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHeikki Halmet <heikki.halmet@qt.io>2021-02-17 13:02:13 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-02-17 12:28:26 +0000
commit963e5ddd4374ea9ae4de5b585d6ad5ad6d65344f (patch)
treed2ceb9f417c7a45ea3b9cf8a95f00ca788b282af
parentad62610ca065a2e37fc2033179ebfc07bc00cfee (diff)
Add Insignificant flag for qtbase Android target with Ubuntu 18.04
Can't start emulator with Ubuntu 18.04 Task-number: QTBUG-91180 Change-Id: I33bbbe47d3f0861778b295ccf797b5a99a99c58a Reviewed-by: Alexey Edelev <alexey.edelev@qt.io> Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io> (cherry picked from commit 36f1125927d37e77ccd8e82cd949dbd8e08c0988) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--coin/platform_configs/qtbase.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
index 68f47d9c..8b3df2cd 100644
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -22,7 +22,7 @@ Configurations:
Compiler: 'GCC'
Target compiler: 'Clang'
Platform dependency: 'Ubuntu-18.04-host'
- Features: ['Packaging', 'Sccache', 'AndroidTestRun']
+ Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'InsignificantTests']
Environment variables: [
'TARGET_CONFIGURE_ARGS=-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_TOOLCHAIN_FILE={{.Env.ANDROID_NDK_ROOT}}/build/cmake/android.toolchain.cmake -DANDROID_SDK_ROOT={{.Env.ANDROID_SDK_HOME}} -DANDROID_ABI=x86 -DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME}} -DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache',
'NON_QTBASE_TARGET_CONFIGURE_ARGS=-DCMAKE_C_COMPILER_LAUNCHER=sccache -DCMAKE_CXX_COMPILER_LAUNCHER=sccache']