diff options
Diffstat (limited to 'coin')
44 files changed, 54 insertions, 126 deletions
diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 8fdd481c..9b6c337c 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -36,7 +36,7 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - - Id: 'android-x86-on-linux' + Id: 'android-6-x86-on-linux' Template: 'qtci-linux-RHEL-8.4-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' @@ -54,19 +54,20 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - - Id: 'android-x86_64-on-linux' + Id: 'android-13-x86_64-on-linux' 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' - Features: ['Packaging', 'Sccache', 'DisableTests', 'UseConfigure'] + 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', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}}', '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_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', + 'ANDROID_EMULATOR=@emulator_x86_64_api_33' ] diff --git a/coin/platform_configs/cmake_platforms_target_android_12.yaml b/coin/platform_configs/cmake_platforms_target_android_12.yaml deleted file mode 100644 index 287f46e4..00000000 --- a/coin/platform_configs/cmake_platforms_target_android_12.yaml +++ /dev/null @@ -1,20 +0,0 @@ -Version: 2 -Configurations: -- - Id: 'android-12-x86_64-on-linux' - 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' - 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', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64}}', - '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 deleted file mode 100644 index 13d0cea3..00000000 --- a/coin/platform_configs/cmake_platforms_target_android_12_insignificant.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_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-8.4' - 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/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 58042f0f..37db729a 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -9,8 +9,8 @@ Configurations: Target compiler: 'Clang' Platform dependency: [ 'rhel-8.4', - 'android-x86-on-linux', - 'android-x86_64-on-linux' + 'android-6-x86-on-linux', + 'android-13-x86_64-on-linux' ] Features: [ 'Sccache', @@ -20,7 +20,7 @@ Configurations: ] Environment variables: [ 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.4', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-x86-on-linux', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-x86_64-on-linux', + 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux', + 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-13-x86_64-on-linux', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"' ] diff --git a/coin/platform_configs/qt3d.yaml b/coin/platform_configs/qt3d.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qt3d.yaml +++ b/coin/platform_configs/qt3d.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index c3233842..a9157b9f 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -1,3 +1,5 @@ Version: 2 -Include: [cmake_platforms.yaml] +Include: [ + cmake_platforms.yaml +] Configurations: [] diff --git a/coin/platform_configs/qt5compat.yaml b/coin/platform_configs/qt5compat.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qt5compat.yaml +++ b/coin/platform_configs/qt5compat.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtactiveqt.yaml b/coin/platform_configs/qtactiveqt.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtactiveqt.yaml +++ b/coin/platform_configs/qtactiveqt.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 8489f0b1..95d80e8c 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -5,7 +5,6 @@ Include: [ integrity.yaml, ios-tests.yaml, address_sanitizer_platforms.yaml, - cmake_platforms_target_android_12.yaml, linux_android_tests_multi_abi.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtcharts.yaml b/coin/platform_configs/qtcharts.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtcharts.yaml +++ b/coin/platform_configs/qtcharts.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtconnectivity.yaml b/coin/platform_configs/qtconnectivity.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtconnectivity.yaml +++ b/coin/platform_configs/qtconnectivity.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtdatavis3d.yaml b/coin/platform_configs/qtdatavis3d.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtdatavis3d.yaml +++ b/coin/platform_configs/qtdatavis3d.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index d95db985..3776bcfc 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -3,7 +3,6 @@ Include: [ cmake_platforms.yaml, integrity.yaml, ios-tests.yaml, - cmake_platforms_static_tests.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms_static_tests.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtdoc.yaml b/coin/platform_configs/qtdoc.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtdoc.yaml +++ b/coin/platform_configs/qtdoc.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qthttpserver.yaml b/coin/platform_configs/qthttpserver.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qthttpserver.yaml +++ b/coin/platform_configs/qthttpserver.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtimageformats.yaml b/coin/platform_configs/qtimageformats.yaml index 05372863..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, - cmake_platforms_target_android_12.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtlanguageserver.yaml b/coin/platform_configs/qtlanguageserver.yaml index 05372863..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, - cmake_platforms_target_android_12.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtlottie.yaml b/coin/platform_configs/qtlottie.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtlottie.yaml +++ b/coin/platform_configs/qtlottie.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtmqtt.yaml b/coin/platform_configs/qtmqtt.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtmqtt.yaml +++ b/coin/platform_configs/qtmqtt.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtmultimedia.yaml b/coin/platform_configs/qtmultimedia.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtmultimedia.yaml +++ b/coin/platform_configs/qtmultimedia.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtnetworkauth.yaml b/coin/platform_configs/qtnetworkauth.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtnetworkauth.yaml +++ b/coin/platform_configs/qtnetworkauth.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtopcua.yaml b/coin/platform_configs/qtopcua.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtopcua.yaml +++ b/coin/platform_configs/qtopcua.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtpositioning.yaml b/coin/platform_configs/qtpositioning.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtpositioning.yaml +++ b/coin/platform_configs/qtpositioning.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtqa.yaml b/coin/platform_configs/qtqa.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtqa.yaml +++ b/coin/platform_configs/qtqa.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtquick3d.yaml b/coin/platform_configs/qtquick3d.yaml index 05372863..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, - cmake_platforms_target_android_12.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtquick3dphysics.yaml b/coin/platform_configs/qtquick3dphysics.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtquick3dphysics.yaml +++ b/coin/platform_configs/qtquick3dphysics.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtquicktimeline.yaml b/coin/platform_configs/qtquicktimeline.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtquicktimeline.yaml +++ b/coin/platform_configs/qtquicktimeline.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtremoteobjects.yaml b/coin/platform_configs/qtremoteobjects.yaml index 05372863..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, - cmake_platforms_target_android_12.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtscxml.yaml b/coin/platform_configs/qtscxml.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtscxml.yaml +++ b/coin/platform_configs/qtscxml.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtsensors.yaml b/coin/platform_configs/qtsensors.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtsensors.yaml +++ b/coin/platform_configs/qtsensors.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtserialbus.yaml b/coin/platform_configs/qtserialbus.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtserialbus.yaml +++ b/coin/platform_configs/qtserialbus.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtserialport.yaml b/coin/platform_configs/qtserialport.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtserialport.yaml +++ b/coin/platform_configs/qtserialport.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtshadertools.yaml b/coin/platform_configs/qtshadertools.yaml index 05372863..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, - cmake_platforms_target_android_12.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtspeech.yaml b/coin/platform_configs/qtspeech.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtspeech.yaml +++ b/coin/platform_configs/qtspeech.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtsvg.yaml b/coin/platform_configs/qtsvg.yaml index 05372863..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, - cmake_platforms_target_android_12.yaml + integrity.yaml ] Configurations: [] diff --git a/coin/platform_configs/qttools.yaml b/coin/platform_configs/qttools.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qttools.yaml +++ b/coin/platform_configs/qttools.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qttranslations.yaml b/coin/platform_configs/qttranslations.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qttranslations.yaml +++ b/coin/platform_configs/qttranslations.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtvirtualkeyboard.yaml b/coin/platform_configs/qtvirtualkeyboard.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtvirtualkeyboard.yaml +++ b/coin/platform_configs/qtvirtualkeyboard.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index ae9874e6..92402966 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -1,7 +1,6 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: # Test on Ubuntu 22.04 Wayland diff --git a/coin/platform_configs/qtwebchannel.yaml b/coin/platform_configs/qtwebchannel.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtwebchannel.yaml +++ b/coin/platform_configs/qtwebchannel.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtwebengine.yaml b/coin/platform_configs/qtwebengine.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtwebengine.yaml +++ b/coin/platform_configs/qtwebengine.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtwebsockets.yaml b/coin/platform_configs/qtwebsockets.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtwebsockets.yaml +++ b/coin/platform_configs/qtwebsockets.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/platform_configs/qtwebview.yaml b/coin/platform_configs/qtwebview.yaml index f1729154..8e519caa 100644 --- a/coin/platform_configs/qtwebview.yaml +++ b/coin/platform_configs/qtwebview.yaml @@ -1,6 +1,5 @@ Version: 2 Include: [ - cmake_platforms.yaml, - cmake_platforms_target_android_12.yaml + cmake_platforms.yaml ] Configurations: [] diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 79627f0f..dbf29ea4 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -155,8 +155,9 @@ echo "Android NDK = $ndkVersion" >> ~/versions.txt cd "$sdkTargetFolder/cmdline-tools/tools/bin" ./sdkmanager --install "emulator" --sdk_root=$sdkTargetFolder \ | eval $sdkmanager_no_progress_bar_cmd -echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \ - "system-images;android-31;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd +echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" | eval $sdkmanager_no_progress_bar_cmd + +echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd echo "Checking the contents of Android SDK again..." @@ -165,8 +166,8 @@ ls -l "$sdkTargetFolder" echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -c 2048M -f \ -k "system-images;android-23;google_apis;x86" -echo "no" | ./avdmanager create avd -n emulator_x86_64_api_31 -c 2048M -f \ - -k "system-images;android-31;google_apis;x86_64" +echo "no" | ./avdmanager create avd -n emulator_x86_64_api_33 -c 2048M -f \ + -k "system-images;android-33;google_apis;x86_64" echo "Install $sdkApiLevelAutomovie $androidAutomotive" DownloadURL "$androidAutomotive11Url" "$androidAutomotive11Url" "$android11Sha" \ |