lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-09-21 16:06:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Android: bump Android target API level to 37

Browse Source 
Provision the Android 17 SDK platform and build tools,
and compile the Gradle cache project against them.

Pick-to: 6.12
Task-number: QTBUG-136620
Change-Id: I6470f60c08f028a2bfbc6ed09a99492d4a174402
Reviewed-by: Ville Voutilainen <[email protected]>
This commit is contained in:
Assam Boudjelthia
2026-09-18 13:41:56 +00:00
parent 1e99891027
commit 1eb5f09e3d
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
coin/provisioning/common/linux/android_linux.sh
+2 -2
View File
@@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"
toolsVersion="19.0"
toolsFile="commandlinetools-linux-13114758_latest.zip"
toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
sdkBuildToolsVersion="36.0.0"
sdkApiLevel="android-36"
sdkBuildToolsVersion="37.0.0"
sdkApiLevel="android-37.0"
toolsSha1="5fdcc763663eefb86a5b8879697aa6088b041e70"
ndkVersionLatest="r27c"
coin/provisioning/common/macos/android.sh
+2 -5
View File
@@ -25,8 +25,8 @@ basePath="http://ci-files01-hki.ci.qt.io/input/android"
toolsVersion="19.0"
toolsFile="commandlinetools-mac-13114758_latest.zip"
toolsBackupUrl="https://dl.google.com/android/repository/$toolsFile"
sdkBuildToolsVersion="35.0.1"
sdkApiLevel="android-35"
sdkBuildToolsVersion="37.0.0"
sdkApiLevel="android-37.0"
toolsSha1="c3e06a1959762e89167d1cbaa988605f6f7c1d24"
ndkVersionLatest="r27c"
@@ -43,9 +43,6 @@ ndkVersionNightly1=$ndkVersionLatest # Set as same version as latest = skip NDK
ndkSha1Nightly1=$ndkSha1Latest
ndkVersionNightly2=$ndkVersionLatest
ndkSha1Nightly2=$ndkSha1Latest
sdkBuildToolsVersion="36.0.0"
# this is compile sdk version
sdkApiLevel="android-36"
toolsTargetFile="/tmp/$toolsFile"
toolsSourceFile="$basePath/$toolsFile"
coin/provisioning/common/shared/gradle/project/app/build.gradle
+2 -1
View File
@@ -4,7 +4,8 @@ plugins {
android {
namespace = 'org.qtproject.qt.gradlecache.app'
compileSdk = 36
compileSdk = 37
compileSdkMinor = 0
defaultConfig {
applicationId 'org.qtproject.qt.gradlecache.app'
coin/provisioning/common/shared/gradle/project/feature/build.gradle
+2 -1
View File
@@ -4,7 +4,8 @@ plugins {
android {
namespace = 'org.qtproject.qt.gradlecache.feature'
compileSdk = 36
compileSdk = 37
compileSdkMinor = 0
defaultConfig {
minSdk = 28
coin/provisioning/common/shared/gradle/project/lib/build.gradle
+2 -1
View File
@@ -4,7 +4,8 @@ plugins {
android {
namespace = 'org.qtproject.qt.gradlecache.lib'
compileSdk = 36
compileSdk = 37
compileSdkMinor = 0
defaultConfig {
minSdk = 28
coin/provisioning/common/windows/android.ps1
+2 -2
View File
@@ -41,8 +41,8 @@ $ndkOfficialUrlNightly2 = "https://dl.google.com/android/repository/android-ndk-
$toolsVersion = "19.0"
$toolsFile = "commandlinetools-win-13114758_latest.zip"
$sdkApi = "ANDROID_API_VERSION"
$sdkApiLevel = "android-36"
$sdkBuildToolsVersion = "36.0.0"
$sdkApiLevel = "android-37.0"
$sdkBuildToolsVersion = "37.0.0"
$toolsCachedUrl= "\\ci-files01-hki.ci.qt.io\provisioning\android\$toolsFile"
$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile"
$toolsChecksum = "54a582f3bf73e04253602f2d1c80bd5868aac115"