Android: Android 15 as maximum supported version

This patch - Replaces Android 14 with Android 15 as a maximum version - Introduces Android 15 system image to CI cache - Sets Android 15 as significant Task-number: QTQAINFRA-6478 Fixes: QTQAINFRA-6653 Pick-to: 6.5 Change-Id: Icb6de43f3e2c2f7f98f3172c83d66bebf9603d24 Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io> (cherry picked from commit 2c85a91e07) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> (cherry picked from commit f537715537)
2026-02-01 19:36:04 +08:00 · 2024-11-13 10:49:06 +02:00
parent e600f0a85b
commit bdd49adae9
4 changed files with 17 additions and 34 deletions
--- a/coin/platform_configs/cmake_platforms_target_android.yaml
+++ b/coin/platform_configs/cmake_platforms_target_android.yaml
@@ -48,7 +48,7 @@ Configurations:
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
 -
-    Id: 'android-14-x86_64-on-linux'
+    Id: 'android-15-x86_64-on-linux'
    Template: 'qtci-linux-RHEL-8.10-x86_64-51'
    Target os: 'Android_ANY'
    Target arch: 'x86_64'
@@ -56,22 +56,6 @@ Configurations:
    Target compiler: 'Clang'
    Platform dependency: 'rhel-8.10'
    Features: ['Packaging', 'Sccache', 'WarningsAreErrors', 'AndroidTestRun', 'VMSize8', 'UseConfigure', 'GenerateSBOM', 'VerifySBOM']
-    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}} -DQT_DEPLOY_FFMPEG=TRUE -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
-        'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}',
-        'ANDROID_EMULATOR=emulator_x86_64_api_34'
-    ]
-
-    Id: 'android-15-x86_64-on-linux'
-    Template: 'qtci-linux-RHEL-8.10-x86_64-50'
-    Target os: 'Android_ANY'
-    Target arch: 'x86_64'
-    Compiler: 'GCC'
-    Target compiler: 'Clang'
-    Platform dependency: 'rhel-8.10'
-    Features: ['Packaging', '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_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',
--- 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-8.10',
        'android-9-x86-on-linux',
-        'android-14-x86_64-on-linux'
+        'android-15-x86_64-on-linux'
    ]
    Features: [
        'Sccache',
@@ -22,7 +22,7 @@ Configurations:
    Environment variables: [
        'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.10',
        '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-14-x86_64-on-linux',
+        'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-15-x86_64-on-linux',
        'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"',
        'ANDROID_EMULATOR=emulator_x86_api_28'
    ]
--- a/coin/platform_configs/tqtc-android-automotive.yaml
+++ b/coin/platform_configs/tqtc-android-automotive.yaml
@@ -13,7 +13,7 @@ Include: [
        'android-arm64-on-macos',
        'android-armv7-on-windows',
        'android-9-x86-on-linux',
-        'android-14-x86_64-on-linux'
+        'android-15-x86_64-on-linux'
    ]
 ]
 Configurations:
--- a/coin/provisioning/common/linux/android_linux.sh
+++ b/coin/provisioning/common/linux/android_linux.sh
@@ -33,11 +33,6 @@ toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
 ndkSha1Latest="fdf33d9f6c1b3f16e5459d53a82c7d2201edbcc4"
 ndkSha1Default=$ndkSha1Latest

-# Android 14 avd zip
-android14SystemZipName="android14system_UE1A_230829_036.tar.gz"
-android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5"
-android14SystemPath="$basePath/$android14SystemZipName"
-
 # Android Automotive max SDK level image
 sdkApiLevelAutomotiveMax="android-34"
 androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
@@ -162,13 +157,20 @@ echo "Unzipping the Android 9 to $minVersionDestination"
 sudo unzip -o -q "$minVersionFilePath" -d "$minVersionDestination"
 rm "$minVersionFilePath"

-echo "y" | ./sdkmanager --install "system-images;android-35;google_apis;x86_64" \
-    | eval "$sdkmanager_no_progress_bar_cmd"
+echo "Download and unzip Android 15 System Image"
+maxVersionFileName="x86_64-35_r08.zip"
+maxVersionDestination="$sdkTargetFolder/system-images/android-35/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"

-echo "Extract stored Android 14 Beta $android14SystemZipName"
-DownloadURL "$android14SystemPath" "$android14SystemPath" "$android14SystemZipSha" \
-    "/tmp/$android14SystemZipName"
-sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images"
+mkdir -p "$maxVersionDestination"
+DownloadURL "$maxVersionCiUrl" "$maxVersionUrl" "$maxVersionSha1" "$maxVersionFilePath"
+
+echo "Unzipping the Android 15 to $maxVersionDestination"
+sudo unzip -o -q "$maxVersionFilePath" -d "$maxVersionDestination"
+rm "$maxVersionFilePath"

 echo "Checking the contents of Android SDK again..."
 ls -l "$sdkTargetFolder"
@@ -176,9 +178,6 @@ 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_34 -c 2048M -f \
-    -k "system-images;android-34;google_apis;x86_64"
-
 echo "no" | ./avdmanager create avd -n emulator_x86_64_api_35 -c 2048M -f \
    -k "system-images;android-35;google_apis;x86_64"