From b808969b95a94daa15b2704405ddaea7ab31b37a Mon Sep 17 00:00:00 2001 From: Rami Potinkara Date: Tue, 30 May 2023 08:44:38 +0300 Subject: [PATCH] Coin/Android: Add Android 14 to CI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add Android 14 to CI and keep 13 as maximum supported version, to allow significant testing for both Android 13 and 14. Android 13 is not yet removed, because Android 14 is still in beta phase, so the plan is to fully replace Android 13 with Android 14 once it's publicly released, and for now test Android 14, to avoid any potential fails that might come before the final release. [*] Android 14 is expected to be released late August 2023. Task-number: QTQAINFRA-5609 Task-number: QTQAINFRA-5557 Change-Id: Ied5c560aa7d60f00948482fb1d7091b3139c6f0c Reviewed-by: Simo Fält --- .../cmake_platforms_target_android.yaml | 16 ++++++++++++++++ coin/provisioning/common/linux/android_linux.sh | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/coin/platform_configs/cmake_platforms_target_android.yaml b/coin/platform_configs/cmake_platforms_target_android.yaml index ec8a7e94..cfae7963 100644 --- a/coin/platform_configs/cmake_platforms_target_android.yaml +++ b/coin/platform_configs/cmake_platforms_target_android.yaml @@ -95,3 +95,19 @@ Configurations: 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', 'ANDROID_EMULATOR=emulator_x86_64_api_33' ] +- + Id: 'android-14-RHEL-8.8-x86_64-on-linux' + Template: 'qtci-linux-RHEL-8.8-x86_64-50' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Platform dependency: 'rhel-8.8' + 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}}', + 'ANDROID_NDK_ROOT={{.Env.ANDROID_NDK_ROOT_DEFAULT}}', + 'ANDROID_EMULATOR=emulator_x86_64_api_34' + ] diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 3c9003da..b9ccc00b 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -124,6 +124,7 @@ echo "y" | ./sdkmanager --install "system-images;android-23;google_apis;x86" | e echo "y" | ./sdkmanager --install "system-images;android-33;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd +echo "y" | ./sdkmanager --install "system-images;android-34;google_apis;x86_64" | eval $sdkmanager_no_progress_bar_cmd echo "Checking the contents of Android SDK again..." ls -l "$sdkTargetFolder" @@ -134,6 +135,9 @@ echo "no" | ./avdmanager create avd -n emulator_x86_api_23 -c 2048M -f \ echo "no" | ./avdmanager create avd -n emulator_x86_64_api_33 -c 2048M -f \ -k "system-images;android-33;google_apis;x86_64" +echo "no" | ./avdmanager create avd -n emulator_x86_64_api_34 -c 2048M -f \ + -k "system-images;android-34;google_apis;x86_64" + echo "Install $sdkApiLevelAutomotive $androidAutomotive" DownloadURL "$androidAutomotive12Url" "$androidAutomotive12Url" "$androidAutomotive12Sha" \ "/tmp/${sdkApiLevelAutomotive}_automotive.tar.gz"