1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: bump Android target API level to 35

Browse Source 
This patch
-updated target API level to 35 into build tools
-updated target API level to 35 in build.gradle files

Task-number: QTBUG-129461
Task-number: QTBUG-130284
Pick-to: 6.5
Change-Id: Iebdc99e6f607352652c3f0022f17de60eae97d58
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
(cherry picked from commit 997a1fae98d35cd0d4d16f37ab68afe2729ff551)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 07f088d340568a3e47cf5cd487c96a6160354afa)
This commit is contained in:
Rami Potinkara 2025-02-12 22:10:06 +02:00
parent c1c4b1cd19
commit 63f085e595
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mkspecs/android-clang/qmake.conf
View File

@ -44,7 +44,7 @@ isEmpty(ALL_ANDROID_ABIS): ALL_ANDROID_ABIS = arm64-v8a armeabi-v7a x86_64 x86
CONFIG += $$ANDROID_PLATFORM CONFIG += $$ANDROID_PLATFORM
ANDROID_MIN_SDK_VERSION = $$replace(ANDROID_PLATFORM, "android-", "") ANDROID_MIN_SDK_VERSION = $$replace(ANDROID_PLATFORM, "android-", "")
ANDROID_TARGET_SDK_VERSION = 34 ANDROID_TARGET_SDK_VERSION = 35
NDK_LLVM_PATH = $$NDK_ROOT/toolchains/llvm/prebuilt/$$NDK_HOST NDK_LLVM_PATH = $$NDK_ROOT/toolchains/llvm/prebuilt/$$NDK_HOST
QMAKE_CC = $$NDK_LLVM_PATH/bin/clang QMAKE_CC = $$NDK_LLVM_PATH/bin/clang

2
mkspecs/features/android/sdk.prf
View File

@ -1,6 +1,6 @@
API_VERSION_TO_USE = $$(ANDROID_API_VERSION) API_VERSION_TO_USE = $$(ANDROID_API_VERSION)
isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION
isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-34 isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-35
ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar
!exists($$ANDROID_JAR_FILE) { !exists($$ANDROID_JAR_FILE) {

2
qmake/doc/src/qmake-manual.qdoc
View File

@ -1088,7 +1088,7 @@
\note This variable applies only to Android targets. \note This variable applies only to Android targets.
Specifies the target Android API level for the project. By default, this Specifies the target Android API level for the project. By default, this
variable is set to API level 34. variable is set to API level 35.
\section1 ANDROID_VERSION_CODE \section1 ANDROID_VERSION_CODE

2
src/android/jar/build.gradle
View File

@ -23,7 +23,7 @@ repositories {
} }
android { android {
compileSdk 34 compileSdk 35
namespace "org.qtproject.qt.android" namespace "org.qtproject.qt.android"
defaultConfig { defaultConfig {

2
src/network/android/jar/build.gradle
View File

@ -23,7 +23,7 @@ repositories {
} }
android { android {
compileSdk 34 compileSdk 35
defaultConfig { defaultConfig {
minSdkVersion 28 minSdkVersion 28

2
src/plugins/networkinformation/android/jar/build.gradle
View File

@ -23,7 +23,7 @@ repositories {
} }
android { android {
compileSdk 34 compileSdk 35
defaultConfig { defaultConfig {
minSdkVersion 28 minSdkVersion 28

2
src/tools/androiddeployqt/main.cpp
View File

@ -172,7 +172,7 @@ struct Options
QString versionName; QString versionName;
QString versionCode; QString versionCode;
QByteArray minSdkVersion{"28"}; QByteArray minSdkVersion{"28"};
QByteArray targetSdkVersion{"34"}; QByteArray targetSdkVersion{"35"};
// lib c++ path // lib c++ path
QString stdCppPath; QString stdCppPath;