diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 5aacf24a..78314c68 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -51,7 +51,7 @@ Configurations: 'ANDROID_EMULATOR=emulator_x86_api_28' ] - - Id: 'android-15-x86_64-on-linux' + Id: 'android-16-x86_64-on-linux' Template: 'qtci-linux-RHEL-9.6-x86_64-51' Target os: 'Android_ANY' Target arch: 'x86_64' @@ -67,21 +67,5 @@ Configurations: # configuration, to ensure builds without this option work too. 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_USE_TARGET_ANDROID_BUILD_DIR=ON -DQT_USE_ANDROID_MODERN_BUNDLE=ON', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', - 'ANDROID_EMULATOR=emulator_x86_64_api_35' - ] -- - Id: 'android-16-x86_64-on-linux' - Template: 'qtci-linux-RHEL-9.6-x86_64-51' - Target os: 'Android_ANY' - Target arch: 'x86_64' - Compiler: 'GCC' - Target compiler: 'Clang' - Platform dependency: 'rhel-9.6' - Features: ['Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM', 'InsignificantTests'] - Environment variables: [ - 'TARGET_CONFIGURE_ARGS=-nomake examples -release -force-debug-info -android-ndk {{.Env.ANDROID_NDK_ROOT_LATEST}} -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_LATEST}} -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON', - 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID_X86_64_NDK_LATEST}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_LATEST}}', 'ANDROID_EMULATOR=emulator_x86_64_api_36' ] diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index c5b0398f..17645aa0 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -10,7 +10,7 @@ Configurations: Platform dependency: [ 'rhel-9.6', 'android-9-x86-on-linux', - 'android-15-x86_64-on-linux' + 'android-16-x86_64-on-linux' ] Features: [ 'Sccache', @@ -24,7 +24,7 @@ Configurations: Environment variables: [ 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-9.6', 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-9-x86-on-linux', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux', + 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-16-x86_64-on-linux', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', 'ANDROID_EMULATOR=emulator_x86_api_28' ] diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index f2fe092c..a99f7ef4 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -12,7 +12,7 @@ Include: [ 'android-arm64-on-macos', 'android-armv7-on-windows', 'android-9-x86-on-linux', - 'android-15-x86_64-on-linux' + 'android-16-x86_64-on-linux' ], offline_documentation.yaml ] diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 924309b2..4d7d88f6 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -184,45 +184,27 @@ echo "Unzipping the Android 9 to $minVersionDestination" sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination" rm "$minVersionFilePath" -echo "Download and unzip Android 15 System Image" -maxVersionFileName="x86_64-35_r08.zip" -maxVersionDestination="$sdkTargetFolder/system-images/android-35/google_apis/" +echo "Download and unzip Android 16 System Image" +maxVersionFileName="x86_64-36_r07.zip" +maxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/" maxVersionFilePath="$maxVersionDestination/$maxVersionFileName" maxVersionCiUrl="$basePath/system_images/google_apis/$maxVersionFileName" maxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$maxVersionFileName" -maxVersionSha1="d79169884cabc6680cb29d32c2112ad46c858c1b" +maxVersionSha1="c6bf44bdcd885bb902b4ba752d111a073ad7a817" mkdir -p "$maxVersionDestination" DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath" -echo "Unzipping the Android 15 to $maxVersionDestination" +echo "Unzipping the Android 16 to $maxVersionDestination" sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination" rm "$maxVersionFilePath" -echo "Download and unzip Android 16 System Image for insignificant" -insignificantMaxVersionFileName="x86_64-36_r06.zip" -insignificantMaxVersionDestination="$sdkTargetFolder/system-images/android-36/google_apis/" -insignificantMaxVersionFilePath="$insignificantMaxVersionDestination/$insignificantMaxVersionFileName" -insignificantMaxVersionCiUrl="$basePath/system_images/google_apis/$insignificantMaxVersionFileName" -insignificantMaxVersionUrl="https://dl.google.com/android/repository/sys-img/google_apis/$insignificantMaxVersionFileName" -insignificantMaxVersionSha1="a9b0b4a0488e0c6c380f5485507950f011388511" - -mkdir -p "$insignificantMaxVersionDestination" -DownloadURL "$insignificantMaxVersionCiUrl" "$insignificantMaxVersionUrl" "$insignificantMaxVersionSha1" "$insignificantMaxVersionFilePath" - -echo "Unzipping the Android 16 insignicant to $insignificantMaxVersionDestination" -sudo unzip -o -q "$insignificantMaxVersionFilePath" -d "$insignificantMaxVersionDestination" -rm "$insignificantMaxVersionFilePath" - echo "Checking the contents of Android SDK again..." ls -l "$sdkTargetFolder" echo "no" | ./avdmanager create avd -n emulator_x86_api_28 -c 2048M -f \ -k "system-images;android-28;google_apis;x86" -echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \ - -k "system-images;android-35;google_apis;x86_64" - echo "no" | ./avdmanager create avd -n emulator_x86_64_api_36 -c 2048M -f \ -k "system-images;android-36;google_apis;x86_64"