diff --git a/coin/platform_configs/cmake_platforms_target_android_12.yaml b/coin/platform_configs/cmake_platforms_target_android_12.yaml new file mode 100644 index 00000000..45150ddb --- /dev/null +++ b/coin/platform_configs/cmake_platforms_target_android_12.yaml @@ -0,0 +1,18 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-RHEL-8.4-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'RHEL-8.4-host' + Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', + 'ANDROID_EMULATOR=@emulator_x86_64_api_31' + ] diff --git a/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml b/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml new file mode 100644 index 00000000..ecaa6038 --- /dev/null +++ b/coin/platform_configs/cmake_platforms_target_android_12_insignificant.yaml @@ -0,0 +1,18 @@ +Version: 2 +Configurations: +- + Template: 'qtci-linux-RHEL-8.4-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'RHEL-8.4-host' + Features: ['Packaging', 'Sccache', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'InsignificantTests'] + Environment variables: [ + 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_DEFAULT}} -android-sdk {{.Env.ANDROID_SDK_ROOT}} -android-abis x86_64', + 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', + 'CONAN_HOST_PROFILE=coin/conan/profiles/ci-linux-x86_64-gcc', + 'CONAN_PROFILE=coin/conan/profiles/ci-unix-android-x86_64-clang', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', + 'ANDROID_EMULATOR=@emulator_x86_64_api_31' + ] diff --git a/coin/platform_configs/qt3d.yaml b/coin/platform_configs/qt3d.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qt3d.yaml +++ b/coin/platform_configs/qt3d.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qt5compat.yaml b/coin/platform_configs/qt5compat.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qt5compat.yaml +++ b/coin/platform_configs/qt5compat.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtactiveqt.yaml b/coin/platform_configs/qtactiveqt.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtactiveqt.yaml +++ b/coin/platform_configs/qtactiveqt.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 30741b41..0e6cc0cb 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -4,6 +4,7 @@ Include: [ cmake_platforms_static_tests.yaml, integrity.yaml, ios-tests.yaml, - address_sanitizer_platforms.yaml + address_sanitizer_platforms.yaml, + cmake_platforms_target_android_12_insignificant.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtcharts.yaml b/coin/platform_configs/qtcharts.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtcharts.yaml +++ b/coin/platform_configs/qtcharts.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtdatavis3d.yaml b/coin/platform_configs/qtdatavis3d.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtdatavis3d.yaml +++ b/coin/platform_configs/qtdatavis3d.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index fde37484..7da70b8e 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -2,6 +2,7 @@ Version: 2 Include: [ cmake_platforms.yaml, integrity.yaml, - cmake_platforms_static_tests.yaml + cmake_platforms_static_tests.yaml, + cmake_platforms_target_android_12.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtdoc.yaml b/coin/platform_configs/qtdoc.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtdoc.yaml +++ b/coin/platform_configs/qtdoc.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qthttpserver.yaml b/coin/platform_configs/qthttpserver.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qthttpserver.yaml +++ b/coin/platform_configs/qthttpserver.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index 82ab0218..05372863 100644 --- a/coin/platform_configs/qtimageformats.yaml +++ b/coin/platform_configs/qtimageformats.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_target_android_12.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtlanguageserver.yaml b/coin/platform_configs/qtlanguageserver.yaml index 82ab0218..05372863 100644 --- a/coin/platform_configs/qtlanguageserver.yaml +++ b/coin/platform_configs/qtlanguageserver.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_target_android_12.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtlottie.yaml b/coin/platform_configs/qtlottie.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtlottie.yaml +++ b/coin/platform_configs/qtlottie.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtmqtt.yaml b/coin/platform_configs/qtmqtt.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtmqtt.yaml +++ b/coin/platform_configs/qtmqtt.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtmultimedia.yaml b/coin/platform_configs/qtmultimedia.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtmultimedia.yaml +++ b/coin/platform_configs/qtmultimedia.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtnetworkauth.yaml b/coin/platform_configs/qtnetworkauth.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtnetworkauth.yaml +++ b/coin/platform_configs/qtnetworkauth.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtopcua.yaml b/coin/platform_configs/qtopcua.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtopcua.yaml +++ b/coin/platform_configs/qtopcua.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtpositioning.yaml b/coin/platform_configs/qtpositioning.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtpositioning.yaml +++ b/coin/platform_configs/qtpositioning.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtqa.yaml b/coin/platform_configs/qtqa.yaml new file mode 100644 index 00000000..f1729154 --- /dev/null +++ b/coin/platform_configs/qtqa.yaml @@ -0,0 +1,6 @@ +Version: 2 +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] +Configurations: [] diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index 82ab0218..05372863 100644 --- a/coin/platform_configs/qtquick3d.yaml +++ b/coin/platform_configs/qtquick3d.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_target_android_12.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtquick3dphysics.yaml b/coin/platform_configs/qtquick3dphysics.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtquick3dphysics.yaml +++ b/coin/platform_configs/qtquick3dphysics.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtquicktimeline.yaml b/coin/platform_configs/qtquicktimeline.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtquicktimeline.yaml +++ b/coin/platform_configs/qtquicktimeline.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtremoteobjects.yaml b/coin/platform_configs/qtremoteobjects.yaml index 82ab0218..05372863 100644 --- a/coin/platform_configs/qtremoteobjects.yaml +++ b/coin/platform_configs/qtremoteobjects.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_target_android_12.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtscxml.yaml b/coin/platform_configs/qtscxml.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtscxml.yaml +++ b/coin/platform_configs/qtscxml.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtsensors.yaml b/coin/platform_configs/qtsensors.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtsensors.yaml +++ b/coin/platform_configs/qtsensors.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtserialbus.yaml b/coin/platform_configs/qtserialbus.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtserialbus.yaml +++ b/coin/platform_configs/qtserialbus.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtserialport.yaml b/coin/platform_configs/qtserialport.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtserialport.yaml +++ b/coin/platform_configs/qtserialport.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtshadertools.yaml b/coin/platform_configs/qtshadertools.yaml index 82ab0218..05372863 100644 --- a/coin/platform_configs/qtshadertools.yaml +++ b/coin/platform_configs/qtshadertools.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_target_android_12.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtspeech.yaml b/coin/platform_configs/qtspeech.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtspeech.yaml +++ b/coin/platform_configs/qtspeech.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index 82ab0218..05372863 100644 --- a/coin/platform_configs/qtsvg.yaml +++ b/coin/platform_configs/qtsvg.yaml @@ -1,6 +1,7 @@ Version: 2 Include: [ cmake_platforms.yaml, - integrity.yaml + integrity.yaml, + cmake_platforms_target_android_12.yaml ] Configurations: [] diff --git a/coin/platform_configs/qttools.yaml b/coin/platform_configs/qttools.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qttools.yaml +++ b/coin/platform_configs/qttools.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qttranslations.yaml b/coin/platform_configs/qttranslations.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qttranslations.yaml +++ b/coin/platform_configs/qttranslations.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtvirtualkeyboard.yaml b/coin/platform_configs/qtvirtualkeyboard.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtvirtualkeyboard.yaml +++ b/coin/platform_configs/qtvirtualkeyboard.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtwebchannel.yaml b/coin/platform_configs/qtwebchannel.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtwebchannel.yaml +++ b/coin/platform_configs/qtwebchannel.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index a9157b9f..f1729154 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -1,5 +1,6 @@ Version: 2 Include: [ - cmake_platforms.yaml -] + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtwebsockets.yaml b/coin/platform_configs/qtwebsockets.yaml index c3233842..f1729154 100644 --- a/coin/platform_configs/qtwebsockets.yaml +++ b/coin/platform_configs/qtwebsockets.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12.yaml + ] Configurations: [] diff --git a/coin/platform_configs/qtwebview.yaml b/coin/platform_configs/qtwebview.yaml index c3233842..a3901904 100644 --- a/coin/platform_configs/qtwebview.yaml +++ b/coin/platform_configs/qtwebview.yaml @@ -1,3 +1,6 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml, + cmake_platforms_target_android_12_insignificant.yaml + ] Configurations: []