lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-05-09 20:47:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update minimum AAOS version in CI to AAOS12

Browse Source 
We dropped support for AAOS10 already in QtAA 6.9, but forgot to update
the minimum SDK version in CI.

Fixes: QAA-3464
Pick-to: 6.11
Change-Id: Iaba6fb08bb6b00f7c01132e7cd528c4727a31859
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
Olli Vuolteenaho
2026-05-05 13:06:44 +03:00
parent 564ea220a3
commit bdff386c19
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
coin/platform_configs/tqtc-android-automotive.yaml
View File

@@ -34,7 +34,7 @@ Configurations:
'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34' 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_34'
] ]
- -
Id: "automotive-android-10-x86_64-on-linux-rhel_9_6" Id: "automotive-android-12-x86_64-on-linux-rhel_9_6"
Template: 'qtci-linux-RHEL-9.6-x86_64-51' Template: 'qtci-linux-RHEL-9.6-x86_64-51'
Target os: 'Android_ANY' Target os: 'Android_ANY'
Target arch: 'x86_64' Target arch: 'x86_64'
@@ -47,5 +47,5 @@ Configurations:
'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}', 'TARGET_CMAKE_ARGS=-DCMAKE_C_COMPILER_FRONTEND_VARIANT=GNU -DCMAKE_CXX_COMPILER_FRONTEND_VARIANT=GNU -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_ANDROID_HOME_LATEST}}',
'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}', 'NON_QTBASE_CMAKE_ARGS=-DFFMPEG_DIR={{.Env.FFMPEG_DIR_ANDROID}}',
'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include', 'NON_QTBASE_TARGET_CMAKE_ARGS= -DQT_PROTOBUF_WELL_KNOWN_TYPES_PROTO_DIR=/usr/local/include',
'ANDROID_EMULATOR=automotive_emulator_x86_64_api_29' 'ANDROID_EMULATOR=automotive_emulator_x86_64_api_31'
] ]

6
coin/provisioning/common/linux/android_linux.sh
View File

@@ -50,9 +50,9 @@ sdkApiLevelAutomotiveMax="android-34"
androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz" androidAutomotiveMaxUrl="$basePath/${sdkApiLevelAutomotiveMax}_automotive.tar.gz"
androidAutomotiveMaxSha="2cc5dae4fd0bdefb188a3b84019d0d1e65501519" androidAutomotiveMaxSha="2cc5dae4fd0bdefb188a3b84019d0d1e65501519"
# Android Automotive min SDK level image # Android Automotive min SDK level image
sdkApiLevelAutomotiveMin="android-29" sdkApiLevelAutomotiveMin="android-31"
androidAutomotiveMinUrl="$basePath/${sdkApiLevelAutomotiveMin}_automotive.tar.gz" androidAutomotiveMinUrl="$basePath/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
androidAutomotiveMinSha="e6092585c00f87eb3b20a2eb7fdf6add42342d2f" androidAutomotiveMinSha="0b6498e0c0022c40b8bb2b275f704e6a298c04a3"
toolsTargetFile="/tmp/$toolsFile" toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile" toolsSourceFile="$basePath/$toolsFile"
@@ -239,7 +239,7 @@ echo "Install minimum supported SDK level image for Android Automotive $sdkApiLe
DownloadURL "$androidAutomotiveMinUrl" "$androidAutomotiveMinUrl" "$androidAutomotiveMinSha" \ DownloadURL "$androidAutomotiveMinUrl" "$androidAutomotiveMinUrl" "$androidAutomotiveMinSha" \
"/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz" "/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz"
sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz" -C $sdkTargetFolder/system-images sudo tar -xzf "/tmp/${sdkApiLevelAutomotiveMin}_automotive.tar.gz" -C $sdkTargetFolder/system-images
echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_29 -c 2048M -f \ echo "no" | ./avdmanager create avd -n automotive_emulator_x86_64_api_31 -c 2048M -f \
-k "system-images;${sdkApiLevelAutomotiveMin};android-automotive;x86_64" -k "system-images;${sdkApiLevelAutomotiveMin};android-automotive;x86_64"
# Purely informative, show the list of avd devices # Purely informative, show the list of avd devices