lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-24 16:05:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Coin: bump Android build tools and platform sdk level from 29 to 30

Browse Source 
Google requires target SDK level 30 for apps that can be accepted to
the Play Store. This change goes together with bumping the default
target sdk in qtbase (from 29 to 30 as well).

Ideally, build tools should be kept up to date as well anyway.

Change-Id: Iac58b7250d7cb639a4d760cf12e7630c9d0b77cc
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
(cherry picked from commit 6ac98447b5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Assam Boudjelthia
2021-08-12 18:33:23 +03:00
committed by Qt Cherry-pick Bot
parent 86a34fb5d7
commit 8ab13223a5
5 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,8 +55,8 @@ toolsVersion="2.1"
toolsFile="commandlinetools-linux-6609375_latest.zip"
ndkVersion="r22b"
ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip"
sdkBuildToolsVersion="29.0.3"
sdkApiLevel="android-29"
sdkBuildToolsVersion="30.0.3"
sdkApiLevel="android-30"
toolsSha1="9172381ff070ee2a416723c1989770cf4b0d1076"
ndkSha1="9ece64c7f19763dd67320d512794969930fce9dc"

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

@@ -51,8 +51,8 @@ $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip"
$toolsVersion = "2.1"
$toolsFile = "commandlinetools-win-6609375_latest.zip"
$sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-29"
$sdkBuildToolsVersion = "29.0.3"
$sdkApiLevel = "android-30"
$sdkBuildToolsVersion = "30.0.3"
$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.14-x86_64/30-android.sh
View File

@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r22b"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
sdkBuildToolsVersion="29.0.3"
sdkBuildToolsVersion="30.0.3"
# this is compile sdk version
sdkApiLevel="android-29"
sdkApiLevel="android-30"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

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

@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r22b"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
sdkBuildToolsVersion="29.0.3"
sdkBuildToolsVersion="30.0.3"
# this is compile sdk version
sdkApiLevel="android-29"
sdkApiLevel="android-30"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"

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

@@ -53,9 +53,9 @@ toolsFile="commandlinetools-mac-6609375_latest.zip"
ndkVersion="r22b"
ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip"
sdkBuildToolsVersion="29.0.3"
sdkBuildToolsVersion="30.0.3"
# this is compile sdk version
sdkApiLevel="android-29"
sdkApiLevel="android-30"
toolsSourceFile="$basePath/$toolsFile"
ndkSourceFile="$basePath/$ndkFile"