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

Coin: bump Android platform sdk and build tools version to 33

Browse Source 
Use latest platform and build tools to be able to build for Android 13.

Change-Id: I00bd9948f528d398d471e91de1d22954d786be29
Reviewed-by: Juha Vuolle <juha.vuolle@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 8abebe23ef)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia
2023-01-17 12:37:26 +02:00
committed by Qt Cherry-pick Bot
parent 270ce23a1b
commit c46c54fe7d
8 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -63,8 +63,8 @@ toolsVersion="2.1"
toolsFile="commandlinetools-linux-6609375_latest.zip"
ndkVersionLatest="r25b"
ndkVersionDefault=$ndkVersionLatest
sdkBuildToolsVersion="31.0.0"
sdkApiLevel="android-31"
sdkBuildToolsVersion="33.0.1"
sdkApiLevel="android-33"
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
ndkSha1Latest="e27dcb9c8bcaa77b78ff68c3f23abcf6867959eb"

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

@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersionLatest="r25b"
ndkVersionDefault="$ndkVersionLatest"
sdkBuildToolsVersion="31.0.0"
sdkBuildToolsVersion="33.0.1"
# this is compile sdk version
sdkApiLevel="android-31"
sdkApiLevel="android-33"
toolsSourceFile="$basePath/$toolsFile"

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

@@ -62,8 +62,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk.zip"
$toolsVersion = "2.1"
$toolsFile = "commandlinetools-win-6609375_latest.zip"
$sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-31"
$sdkBuildToolsVersion = "31.0.0"
$sdkApiLevel = "android-33"
$sdkBuildToolsVersion = "33.0.1"
$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile"
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"

4
coin/provisioning/qtci-macos-10.15-x86_64/30-android.sh
View File

@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r25b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="31.0.0"
sdkBuildToolsVersion="33.0.1"
# this is compile sdk version
sdkApiLevel="android-31"
sdkApiLevel="android-33"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

4
coin/provisioning/qtci-macos-11-arm/30-android.sh
View File

@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r25b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="28.0.3"
sdkBuildToolsVersion="33.0.1"
# this is compile sdk version
sdkApiLevel="android-28"
sdkApiLevel="android-33"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

4
coin/provisioning/qtci-macos-11-x86_64/30-android.sh
View File

@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r25b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="31.0.0"
sdkBuildToolsVersion="33.0.1"
# this is compile sdk version
sdkApiLevel="android-31"
sdkApiLevel="android-33"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

4
coin/provisioning/qtci-macos-12-arm/30-android.sh
View File

@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r25b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="28.0.3"
sdkBuildToolsVersion="33.0.1"
# this is compile sdk version
sdkApiLevel="android-28"
sdkApiLevel="android-33"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

4
coin/provisioning/qtci-macos-13-arm/30-android.sh
View File

@@ -59,9 +59,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r25b"
ndkFile="android-ndk-$ndkVersion-darwin.zip"
sdkBuildToolsVersion="28.0.3"
sdkBuildToolsVersion="33.0.1"
# this is compile sdk version
sdkApiLevel="android-28"
sdkApiLevel="android-33"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"