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

Provisioning: bump Android sdkBuildToolsVersion and sdkApiLevel to 36

Browse Source 
This patch bumps:
-The sdkBuildToolsVersion used in Coin to 36.0.0
-The sdkApiLevel used in Coin to 36

Task-number: QTBUG-138550
Task-number: QTBUG-138549
Pick-to: 6.11 6.10 6.8
Change-Id: Ic63cd28ba39743e517ea3a3e2f9ec08bd5dc3267
Reviewed-by: Jukka Jokiniva <jukka.jokiniva@qt.io>
This commit is contained in:
Rami Potinkara
2025-09-03 09:08:06 +03:00
parent 90a2d21db6
commit 2795f20a4e
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"
toolsVersion="19.0" toolsVersion="19.0"
toolsFile="commandlinetools-linux-13114758_latest.zip" toolsFile="commandlinetools-linux-13114758_latest.zip"
toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile" toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
sdkBuildToolsVersion="35.0.1" sdkBuildToolsVersion="36.0.0"
sdkApiLevel="android-35" sdkApiLevel="android-36"
toolsSha1="5fdcc763663eefb86a5b8879697aa6088b041e70" toolsSha1="5fdcc763663eefb86a5b8879697aa6088b041e70"
ndkVersionLatest="r27c" ndkVersionLatest="r27c"

4
coin/provisioning/common/macos/android.sh
View File

@@ -41,9 +41,11 @@ ndkSha1Preview="09be4f8fb626a9c93415198ea8e75d8d82f528fa"
ndkVersionNightly1=$ndkVersionLatest # Set as same version as latest = skip NDK install in provisioning ndkVersionNightly1=$ndkVersionLatest # Set as same version as latest = skip NDK install in provisioning
ndkSha1Nightly1=$ndkSha1Latest ndkSha1Nightly1=$ndkSha1Latest
ndkVersionNightly2=$ndkVersionLatest ndkVersionNightly2=$ndkVersionLatest
ndkSha1Nightly2=$ndkSha1Latest ndkSha1Nightly2=$ndkSha1Latest
sdkBuildToolsVersion="36.0.0"
# this is compile sdk version
sdkApiLevel="android-36"
toolsTargetFile="/tmp/$toolsFile" toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile" toolsSourceFile="$basePath/$toolsFile"

4
coin/provisioning/common/windows/android.ps1
View File

@@ -41,8 +41,8 @@ $ndkOfficialUrlNightly2 = "https://dl.google.com/android/repository/android-ndk-
$toolsVersion = "19.0" $toolsVersion = "19.0"
$toolsFile = "commandlinetools-win-13114758_latest.zip" $toolsFile = "commandlinetools-win-13114758_latest.zip"
$sdkApi = "ANDROID_API_VERSION" $sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-35" $sdkApiLevel = "android-36"
$sdkBuildToolsVersion = "35.0.1" $sdkBuildToolsVersion = "36.0.0"
$toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile" $toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" $toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
$toolsChecksum = "54a582f3bf73e04253602f2d1c80bd5868aac115" $toolsChecksum = "54a582f3bf73e04253602f2d1c80bd5868aac115"