From 2d7f6760dd6a9543ff9e65d88ec0ae312b55d1d9 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 16 Jan 2024 11:17:23 +0200 Subject: [PATCH] Coin:Android: bump minimum CI test emulator to Android 8 api 26 Qt 6.7 has the minimum supported Android version as 8, this applies that to the CI as well. Pick-to: 6.7 Task-number: QTBUG-111919 Change-Id: Id4c9eda29f1b61bf739eae3624b07f44a893cfae Reviewed-by: Rami Potinkara Reviewed-by: Heikki Halmet --- coin/platform_configs/cmake_platforms_target_android.yaml | 4 ++-- coin/platform_configs/linux_android_tests_developer.yaml | 2 +- coin/platform_configs/linux_android_tests_multi_abi.yaml | 6 +++--- coin/platform_configs/tqtc-android-automotive.yaml | 2 +- coin/provisioning/common/linux/android_linux.sh | 6 +++--- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index 89f85eb1..d10bff06 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -32,7 +32,7 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}' ] - - Id: 'android-6-x86-on-linux' + Id: 'android-8-x86-on-linux' Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86' @@ -45,7 +45,7 @@ Configurations: '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}} -DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', - 'ANDROID_EMULATOR=emulator_x86_api_23' + 'ANDROID_EMULATOR=emulator_x86_api_26' ] - Id: 'android-14-x86_64-on-linux' diff --git a/coin/platform_configs/linux_android_tests_developer.yaml b/coin/platform_configs/linux_android_tests_developer.yaml index a5f373fa..045edd36 100644 --- a/coin/platform_configs/linux_android_tests_developer.yaml +++ b/coin/platform_configs/linux_android_tests_developer.yaml @@ -14,4 +14,4 @@ Configurations: 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_DEFAULT}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF', - 'ANDROID_EMULATOR=emulator_x86_api_23'] + 'ANDROID_EMULATOR=emulator_x86_api_26'] diff --git a/coin/platform_configs/linux_android_tests_multi_abi.yaml b/coin/platform_configs/linux_android_tests_multi_abi.yaml index 9a68ea6f..b0443004 100644 --- a/coin/platform_configs/linux_android_tests_multi_abi.yaml +++ b/coin/platform_configs/linux_android_tests_multi_abi.yaml @@ -9,7 +9,7 @@ Configurations: Target compiler: 'Clang' Platform dependency: [ 'rhel-8.8', - 'android-6-x86-on-linux', + 'android-8-x86-on-linux', 'android-14-x86_64-on-linux' ] Features: [ @@ -21,8 +21,8 @@ Configurations: ] Environment variables: [ 'QT_CI_ARTIFACT_ID_PATH_Android-host=QT_CI_ARTIFACT_ID_PATH_rhel-8.8', - 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-6-x86-on-linux', + 'QT_CI_ARTIFACT_ID_PATH_Android-x86=QT_CI_ARTIFACT_ID_PATH_android-8-x86-on-linux', 'QT_CI_ARTIFACT_ID_PATH_Android-x86_64=QT_CI_ARTIFACT_ID_PATH_android-14-x86_64-on-linux', 'COMMON_TARGET_TEST_CMAKE_ARGS=-DQT_ANDROID_ABIS="x86;x86_64"', - 'ANDROID_EMULATOR=emulator_x86_api_23' + 'ANDROID_EMULATOR=emulator_x86_api_26' ] diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 84746b6b..2539bcb7 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -12,7 +12,7 @@ Include: [ cmake_platforms_target_android.yaml: [ 'android-arm64-on-macos', 'android-armv7-on-windows', - 'android-6-x86-on-linux', + 'android-8-x86-on-linux', 'android-14-x86_64-on-linux' ] ] diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index bab03159..f58ab95e 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -147,7 +147,7 @@ echo "Unzipping the Android Emulator to '$sdkTargetFolder'" sudo unzip -o -q "$emulatorTargetFile" -d "$sdkTargetFolder" rm "$emulatorTargetFile" -echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" \ +echo "y" | ./sdkmanager --install "system-images;android-26;google_apis;x86" \ | eval "$sdkmanager_no_progress_bar_cmd" echo "Extract stored Android 14 Beta $android14SystemZipName" @@ -158,8 +158,8 @@ sudo tar -xzf "/tmp/$android14SystemZipName" -C "$sdkTargetFolder/system-images" echo "Checking the contents of Android SDK again..." 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_api_26 -c 2048M -f \ + -k "system-images;android-26;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"