mirror of
git://code.qt.io/qt/qt5.git
synced 2026-04-17 10:36:07 +08:00
Provisioning: bump Android sdkBuildToolsVersion to 35
This patch bumps the sdkBuildToolsVersion used in Coin to 35. Task-number: QTBUG-129461 Task-number: QTBUG-130283 Pick-to: 6.9 6.8 6.5 Change-Id: I2e1fbdfd23cb854ec50625ff29331adc61abc32c Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
This commit is contained in:
@@ -26,7 +26,7 @@ toolsVersion="2.1"
|
|||||||
toolsFile="commandlinetools-linux-6609375_latest.zip"
|
toolsFile="commandlinetools-linux-6609375_latest.zip"
|
||||||
ndkVersionLatest="r26b"
|
ndkVersionLatest="r26b"
|
||||||
ndkVersionDefault=$ndkVersionLatest
|
ndkVersionDefault=$ndkVersionLatest
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
sdkApiLevel="android-35"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
|
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersionLatest="r26b"
|
ndkVersionLatest="r26b"
|
||||||
ndkVersionDefault="$ndkVersionLatest"
|
ndkVersionDefault="$ndkVersionLatest"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-35"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ $toolsVersion = "2.1"
|
|||||||
$toolsFile = "commandlinetools-win-6609375_latest.zip"
|
$toolsFile = "commandlinetools-win-6609375_latest.zip"
|
||||||
$sdkApi = "ANDROID_API_VERSION"
|
$sdkApi = "ANDROID_API_VERSION"
|
||||||
$sdkApiLevel = "android-35"
|
$sdkApiLevel = "android-35"
|
||||||
$sdkBuildToolsVersion = "34.0.0"
|
$sdkBuildToolsVersion = "35.0.1"
|
||||||
$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 = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
|
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-35"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-35"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-35"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-35"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-35"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-35"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
|
|||||||
@@ -22,7 +22,7 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
|
|||||||
|
|
||||||
ndkVersion="r26b"
|
ndkVersion="r26b"
|
||||||
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
ndkFile="android-ndk-$ndkVersion-darwin.zip"
|
||||||
sdkBuildToolsVersion="34.0.0"
|
sdkBuildToolsVersion="35.0.1"
|
||||||
# this is compile sdk version
|
# this is compile sdk version
|
||||||
sdkApiLevel="android-35"
|
sdkApiLevel="android-35"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user