mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-02 03:36:54 +08:00
Coin: bump Android platform sdk and build tools version to 33
Use latest platform and build tools to be able to build for Android 13. Pick-to: 6.5 Change-Id: I00bd9948f528d398d471e91de1d22954d786be29 Reviewed-by: Juha Vuolle <juha.vuolle@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user