mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-24 16:05:36 +08:00
Provisioning: bump Android sdkBuildToolsVersion and sdkApiLevel to 36
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 Change-Id: Ic63cd28ba39743e517ea3a3e2f9ec08bd5dc3267 Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
This commit is contained in:
@@ -24,8 +24,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"
|
||||
|
||||
toolsVersion="2.1"
|
||||
toolsFile="commandlinetools-linux-6609375_latest.zip"
|
||||
sdkBuildToolsVersion="35.0.1"
|
||||
sdkApiLevel="android-35"
|
||||
sdkBuildToolsVersion="36.0.0"
|
||||
sdkApiLevel="android-36"
|
||||
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
|
||||
|
||||
ndkVersionLatest="r27c"
|
||||
|
||||
@@ -27,9 +27,9 @@ ndkVersionLatest="r27c"
|
||||
ndkVersionNightly1="$ndkVersionLatest" # If same version as latest = skip NDK install for nightly
|
||||
ndkVersionNightly2="$ndkVersionLatest"
|
||||
|
||||
sdkBuildToolsVersion="35.0.1"
|
||||
sdkBuildToolsVersion="36.0.0"
|
||||
# this is compile sdk version
|
||||
sdkApiLevel="android-35"
|
||||
sdkApiLevel="android-36"
|
||||
|
||||
toolsSourceFile="$basePath/$toolsFile"
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ $ndkOfficialUrlNightly2 = "https://dl.google.com/android/repository/android-ndk-
|
||||
$toolsVersion = "2.1"
|
||||
$toolsFile = "commandlinetools-win-6609375_latest.zip"
|
||||
$sdkApi = "ANDROID_API_VERSION"
|
||||
$sdkApiLevel = "android-35"
|
||||
$sdkBuildToolsVersion = "35.0.1"
|
||||
$sdkApiLevel = "android-36"
|
||||
$sdkBuildToolsVersion = "36.0.0"
|
||||
$toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
|
||||
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
|
||||
$toolsChecksum = "e2e19c2ff584efa87ef0cfdd1987f92881323208"
|
||||
|
||||
Reference in New Issue
Block a user