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.

Task-number: QTBUG-88846
Change-Id: I8bc1638df48ad27781160df943c0126ffe495a3e
Reviewed-by: Toni Saario <toni.saario@qt.io>
(cherry picked from commit 1d4f821520)
Reviewed-by: Simo Fält <simo.falt@qt.io>

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'

coin/platform_configs/linux_android_tests.yaml

@@ -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'
-    ]

coin/platform_configs/qt3d.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
 Configurations: []

coin/platform_configs/qt5compat.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
 Configurations: []

coin/platform_configs/qtbase.yaml

@@ -3,7 +3,6 @@ Include: [
     cmake_platforms.yaml,
     cmake_platforms_static_tests.yaml,
     integrity.yaml,
-    ios-tests.yaml,
+    ios-tests.yaml
-    linux_android_tests.yaml
 ]
 Configurations: []

coin/platform_configs/qtcharts.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []

coin/platform_configs/qtcoap.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []

coin/platform_configs/qtconnectivity.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
 Configurations: []

coin/platform_configs/qtdatavis3d.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []

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: []

coin/platform_configs/qtimageformats.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
+    integrity.yaml
-    linux_android_tests.yaml
 ]
 Configurations: []

coin/platform_configs/qtlanguageserver.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
+    integrity.yaml
-    linux_android_tests.yaml
 ]
 Configurations: []

coin/platform_configs/qtlottie.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []

coin/platform_configs/qtmqtt.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
 Configurations: []

coin/platform_configs/qtmultimedia.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []

coin/platform_configs/qtnetworkauth.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []

coin/platform_configs/qtpositioning.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
 Configurations: []

coin/platform_configs/qtquick3d.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
+    integrity.yaml
-    linux_android_tests.yaml
 ]
 Configurations: []

coin/platform_configs/qtquicktimeline.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
 Configurations: []

coin/platform_configs/qtremoteobjects.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
+    integrity.yaml
-    linux_android_tests.yaml
 ]
 Configurations: []

coin/platform_configs/qtscxml.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
 Configurations: []

coin/platform_configs/qtsensors.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
 Configurations: []

coin/platform_configs/qtserialbus.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
 Configurations: []

coin/platform_configs/qtserialport.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []

coin/platform_configs/qtshadertools.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
+    integrity.yaml
-    linux_android_tests.yaml
 ]
 Configurations: []

coin/platform_configs/qtspeech.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []

coin/platform_configs/qtsvg.yaml

@@ -1,7 +1,6 @@
 Version: 2
 Include: [
     cmake_platforms.yaml,
-    integrity.yaml,
+    integrity.yaml
-    linux_android_tests.yaml
 ]
 Configurations: []

coin/platform_configs/qttranslations.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-  ]
 Configurations: []

coin/platform_configs/qtwebchannel.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []

coin/platform_configs/qtwebsockets.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []

coin/platform_configs/qtwebview.yaml

@@ -1,6 +1,3 @@
 Version: 2
-Include: [
+Include: [cmake_platforms.yaml]
-    cmake_platforms.yaml,
-    linux_android_tests.yaml
-]
 Configurations: []