diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2022-05-18 21:39:23 +0000 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2022-05-19 10:30:49 +0200 |
| commit | 9ca095147053c401e33d36c28475c0882d088caf (patch) | |
| tree | 93d3c6913cd50ec43446bc81e6c499277230e42d | |
| parent | 5d266909a47884a36053def97abebb69374ab9e2 (diff) | |
Revert "Activate testing of developer build for Android in qtdeclarative"
This reverts commit 2e29f9e19f5f6b10bcca4ca6dfb7959b8ff4a6d1.
Reason for revert: Some patches blacklisting Android need to
be integrated first in qtdeclarative/6.3.
Change-Id: I782cd394a8f5020f8aecc0e9c08f00a4fc9f833a
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
| -rw-r--r-- | coin/platform_configs/linux_android_tests_developer.yaml | 16 | ||||
| -rw-r--r-- | coin/platform_configs/qtdeclarative.yaml | 3 |
2 files changed, 1 insertions, 18 deletions
diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml deleted file mode 100644 index d5f54348..00000000 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ /dev/null @@ -1,16 +0,0 @@ -Version: 2 -Configurations: -- - Template: 'qtci-linux-RHEL-8.4-x86_64-50' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'RHEL-8.4-host' - Features: ['Packaging', 'Sccache', 'AndroidTestRun'] - 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}}', - 'CONAN_HOST_PROFILE=coin/conan/profiles/linux-x86_64-gcc', - 'CONAN_INSTALL_DIR={{.InstallDir}}/target', - 'CONAN_PROFILE=coin/conan/profiles/unix-android-x86-clang', - 'ANDROID_EMULATOR=@emulator_x86_api_23'] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 9ae28988..bf3d33e7 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -3,7 +3,6 @@ Include: [ cmake_platforms.yaml, integrity.yaml, cmake_platforms_static_tests.yaml, - linux_android_tests.yaml, - linux_android_tests_developer.yaml + linux_android_tests.yaml ] Configurations: [] |