From b4861bc8d15e49c8578386b7fd610dee0901e0bf Mon Sep 17 00:00:00 2001 From: Olli Vuolteenaho Date: Thu, 16 May 2024 10:18:52 +0300 Subject: [PATCH] Update QtAA maximum supported SDK level Like regular Android we test QtAA in CI with the maximum and minimum supported SDK levels - currently 10 and 13. This commit bumps the maximum level to 14 starting from QtAA 6.8. Task-number: QAA-2410 Change-Id: I8ef645b2c7bb1ee2b1fd20980bad0f593d308df8 Reviewed-by: Assam Boudjelthia (cherry picked from commit eb75583856ca67089785a32b22a6043f2cfb2798) Reviewed-by: Qt Cherry-pick Bot --- coin/platform_configs/tqtc-android-automotive.yaml | 4 ++-- coin/provisioning/common/linux/android_linux.sh | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/platform_configs/tqtc-android-automotive.yaml b/coin/platform_configs/tqtc-android-automotive.yaml index 0f45f161..06b3c8c0 100644 --- a/coin/platform_configs/tqtc-android-automotive.yaml +++ b/coin/platform_configs/tqtc-android-automotive.yaml @@ -18,7 +18,7 @@ Include: [ ] Configurations: - - Id: "automotive-android-13-x86_64-on-linux" + Id: "automotive-android-14-x86_64-on-linux" Template: 'qtci-linux-RHEL-8.8-x86_64-50' Target os: 'Android_ANY' Target arch: 'x86_64' @@ -31,7 +31,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}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'NON_QTBASE_TARGET_CMAKE_ARGS=-DFEATURE_native_grpc=OFF -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', - 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_33' + 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34' ] - Id: "automotive-android-10-x86_64-on-linux" diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 98961077..8d3c0d86 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -39,9 +39,9 @@ android14SystemZipSha="ede80c6901e8fad1895c97a86542b8e072bb1ee5" android14SystemPath="$basePath/$android14SystemZipName" # Android Automotive max SDK level image -sdkApiLevelAutomotiveMax="android-33" +sdkApiLevelAutomotiveMax="android-34" androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" -androidAutomotiveMaxSha="b020a938ec46af2510047284406e9bed608cad03" +androidAutomotiveMaxSha="2cc5dae4fd0bdefb188a3b84019d0d1e65501519" # Android Automotive min SDK level image sdkApiLevelAutomotiveMin="android-29" androidAutomotiveMinUrl="$basePath/${sdkApiLevelAutomotiveMin}_automotive.tar.gz" @@ -168,7 +168,7 @@ echo "Install maximum supported SDK level image for Android Automotive $sdkApiLe DownloadURL "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxUrl" "$androidAutomotiveMaxSha" \ "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" -C "$sdkTargetFolder/system-images" -echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_33 -c 2048M -f \ +echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_34 -c 2048M -f \ -k "system-images;${sdkApiLevelAutomotiveMax};android-automotive;x86_64" echo "Install minimum supported SDK level image for Android Automotive $sdkApiLevelAutomotiveMin"