Coin:Android: Enable tests for default packaging target - Part 5

This makes sure Android tests are run by default for packaging
targets for various integrations including qt5 integrations and
potential issues are caught up early on especially when doing
sumobules updates and coin scripts updates.

Also, this makes it easier to manage instead of having the tests
enabled per module. Thus, this removes the Android test include
from the individual modules because it will be retrieved directly
from cmake_platforms_target_android_host_linux.yaml which is included
by cmake_platforms.yaml.

Pick-to: 6.2 6.3 6.4
Task-number: QTBUG-88846
Change-Id: I8bc1638df48ad27781160df943c0126ffe495a3e
Reviewed-by: Toni Saario <toni.saario@qt.io>

31 files changed, 31 insertions, 119 deletions

diff --git a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
index 54e22400..06923f7f 100644
--- a/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android_host_linux.yaml
@@ -35,12 +35,13 @@ Configurations:
     Compiler: 'GCC'
     Target compiler: 'Clang'
     Platform dependency: 'RHEL-8.4-host'
-    Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure']
+    Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'UseConfigure']
     Environment variables: [
         'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -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/ci-linux-x86_64-gcc',
-        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang'
+        'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86-clang',
+        'ANDROID_EMULATOR=@emulator_x86_api_23'
     ]
 -
     Template: 'qtci-linux-RHEL-8.4-x86_64-50'
diff --git a/coin/platform_configs/linux_android_tests.yaml b/coin/platform_configs/linux_android_tests.yaml
deleted file mode 100644
index 52d93846..00000000
--- a/coin/platform_configs/linux_android_tests.yaml
+++ /dev/null
@@ -1,18 +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', 'UseConfigure']
-    Environment variables: [
-        'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -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',
-        'ANDROID_EMULATOR=@emulator_x86_api_23'
-    ]
diff --git a/coin/platform_configs/qt3d.yaml b/coin/platform_configs/qt3d.yaml
index 0fc434e8..c3233842 100644
--- a/coin/platform_configs/qt3d.yaml
+++ b/coin/platform_configs/qt3d.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qt5compat.yaml b/coin/platform_configs/qt5compat.yaml
index 0fc434e8..c3233842 100644
--- a/coin/platform_configs/qt5compat.yaml
+++ b/coin/platform_configs/qt5compat.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml
index 3660770e..30741b41 100644
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -4,7 +4,6 @@ Include: [
     cmake_platforms_static_tests.yaml,
     integrity.yaml,
     ios-tests.yaml,
-    address_sanitizer_platforms.yaml,
-    linux_android_tests.yaml
+    address_sanitizer_platforms.yaml
 ]
 Configurations: []
diff --git a/coin/platform_configs/qtcharts.yaml b/coin/platform_configs/qtcharts.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtcharts.yaml
+++ b/coin/platform_configs/qtcharts.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtcoap.yaml b/coin/platform_configs/qtcoap.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtcoap.yaml
+++ b/coin/platform_configs/qtcoap.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml
index 0fc434e8..c3233842 100644
--- a/coin/platform_configs/qtconnectivity.yaml
+++ b/coin/platform_configs/qtconnectivity.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtdatavis3d.yaml b/coin/platform_configs/qtdatavis3d.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtdatavis3d.yaml
+++ b/coin/platform_configs/qtdatavis3d.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml
index 9ae28988..1130242e 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
 ]
 Configurations: []
diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml
index 5d531862..82ab0218 100644
--- a/coin/platform_configs/qtimageformats.yaml
+++ b/coin/platform_configs/qtimageformats.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
-    linux_android_tests.yaml
+    integrity.yaml
 ]
 Configurations: []
diff --git a/coin/platform_configs/qtlanguageserver.yaml b/coin/platform_configs/qtlanguageserver.yaml
index 5d531862..82ab0218 100644
--- a/coin/platform_configs/qtlanguageserver.yaml
+++ b/coin/platform_configs/qtlanguageserver.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
-    linux_android_tests.yaml
+    integrity.yaml
 ]
 Configurations: []
diff --git a/coin/platform_configs/qtlottie.yaml b/coin/platform_configs/qtlottie.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtlottie.yaml
+++ b/coin/platform_configs/qtlottie.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtmqtt.yaml b/coin/platform_configs/qtmqtt.yaml
index 0fc434e8..c3233842 100644
--- a/coin/platform_configs/qtmqtt.yaml
+++ b/coin/platform_configs/qtmqtt.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtmultimedia.yaml b/coin/platform_configs/qtmultimedia.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtmultimedia.yaml
+++ b/coin/platform_configs/qtmultimedia.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtnetworkauth.yaml b/coin/platform_configs/qtnetworkauth.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtnetworkauth.yaml
+++ b/coin/platform_configs/qtnetworkauth.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtpositioning.yaml b/coin/platform_configs/qtpositioning.yaml
index 0fc434e8..c3233842 100644
--- a/coin/platform_configs/qtpositioning.yaml
+++ b/coin/platform_configs/qtpositioning.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml
index 5d531862..82ab0218 100644
--- a/coin/platform_configs/qtquick3d.yaml
+++ b/coin/platform_configs/qtquick3d.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
-    linux_android_tests.yaml
+    integrity.yaml
 ]
 Configurations: []
diff --git a/coin/platform_configs/qtquicktimeline.yaml b/coin/platform_configs/qtquicktimeline.yaml
index 0fc434e8..c3233842 100644
--- a/coin/platform_configs/qtquicktimeline.yaml
+++ b/coin/platform_configs/qtquicktimeline.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtremoteobjects.yaml b/coin/platform_configs/qtremoteobjects.yaml
index 5d531862..82ab0218 100644
--- a/coin/platform_configs/qtremoteobjects.yaml
+++ b/coin/platform_configs/qtremoteobjects.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
-    linux_android_tests.yaml
+    integrity.yaml
 ]
 Configurations: []
diff --git a/coin/platform_configs/qtscxml.yaml b/coin/platform_configs/qtscxml.yaml
index 0fc434e8..c3233842 100644
--- a/coin/platform_configs/qtscxml.yaml
+++ b/coin/platform_configs/qtscxml.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtsensors.yaml b/coin/platform_configs/qtsensors.yaml
index 0fc434e8..c3233842 100644
--- a/coin/platform_configs/qtsensors.yaml
+++ b/coin/platform_configs/qtsensors.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtserialbus.yaml b/coin/platform_configs/qtserialbus.yaml
index 0fc434e8..c3233842 100644
--- a/coin/platform_configs/qtserialbus.yaml
+++ b/coin/platform_configs/qtserialbus.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtserialport.yaml b/coin/platform_configs/qtserialport.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtserialport.yaml
+++ b/coin/platform_configs/qtserialport.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtshadertools.yaml b/coin/platform_configs/qtshadertools.yaml
index 5d531862..82ab0218 100644
--- a/coin/platform_configs/qtshadertools.yaml
+++ b/coin/platform_configs/qtshadertools.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
-    linux_android_tests.yaml
+    integrity.yaml
 ]
 Configurations: []
diff --git a/coin/platform_configs/qtspeech.yaml b/coin/platform_configs/qtspeech.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtspeech.yaml
+++ b/coin/platform_configs/qtspeech.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml
index 5d531862..82ab0218 100644
--- a/coin/platform_configs/qtsvg.yaml
+++ b/coin/platform_configs/qtsvg.yaml
@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
-    linux_android_tests.yaml
+    integrity.yaml
 ]
 Configurations: []
diff --git a/coin/platform_configs/qttranslations.yaml b/coin/platform_configs/qttranslations.yaml
index 0fc434e8..c3233842 100644
--- a/coin/platform_configs/qttranslations.yaml
+++ b/coin/platform_configs/qttranslations.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtwebchannel.yaml b/coin/platform_configs/qtwebchannel.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtwebchannel.yaml
+++ b/coin/platform_configs/qtwebchannel.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtwebsockets.yaml b/coin/platform_configs/qtwebsockets.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtwebsockets.yaml
+++ b/coin/platform_configs/qtwebsockets.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []
diff --git a/coin/platform_configs/qtwebview.yaml b/coin/platform_configs/qtwebview.yaml
index 75115e63..c3233842 100644
--- a/coin/platform_configs/qtwebview.yaml
+++ b/coin/platform_configs/qtwebview.yaml
@@ -1,6 +1,3 @@
 Version: 2
-Include: [
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
+Include: [cmake_platforms.yaml]
 Configurations: []