diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2024-12-05 16:00:38 +0200 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2024-12-07 03:29:45 +0200 |
| commit | 953b7aaddc7579a253cd15562de6eec9476245e4 (patch) | |
| tree | 5c014f308c8a39535429f5eb7f26fd90f32118a1 | |
| parent | faec1a022deb4eff2e38db9f562b4307595f0835 (diff) | |
Android: use latest platform only if the default is not found
We initially set a value to QT_ANDROID_API_USED_FOR_JAVA as the
default supported version, so consistently use that unless it's
not found at which case try to take the latest found version.
Task-number: QTBUG-128364
Change-Id: I5e8404887b1649aad3ae37d2352e3ca099392935
Reviewed-by: Lars Schmertmann <lars.schmertmann@governikus.de>
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
| -rw-r--r-- | cmake/QtPlatformAndroid.cmake | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake index d5e86ff72d0..1745d8de839 100644 --- a/cmake/QtPlatformAndroid.cmake +++ b/cmake/QtPlatformAndroid.cmake @@ -23,10 +23,6 @@ if (NOT IS_DIRECTORY "${ANDROID_SDK_ROOT}") message(FATAL_ERROR "Could not find ANDROID_SDK_ROOT or path is not a directory: ${ANDROID_SDK_ROOT}") endif() -# This variable specifies the API level used for building Java code, it can be the same as Qt for -# Android's maximum supported Android version or higher. -set(QT_ANDROID_API_USED_FOR_JAVA "android-34") - function(qt_internal_sort_android_platforms out_var) if(CMAKE_VERSION GREATER_EQUAL 3.18) set(platforms ${ARGN}) @@ -54,18 +50,18 @@ function(qt_internal_sort_android_platforms out_var) set("${out_var}" "${platforms}" PARENT_SCOPE) endfunction() -macro(qt_internal_get_android_platform_version out_var android_platform) - string(REGEX REPLACE ".*-([0-9]+)$" "\\1" ${out_var} "${android_platform}") -endmacro() - -_qt_internal_detect_latest_android_platform(android_platform_latest) -if(android_platform_latest) - qt_internal_get_android_platform_version(latest_platform_version - "${android_platform_latest}") - qt_internal_get_android_platform_version(required_platform_version - "${QT_ANDROID_API_USED_FOR_JAVA}") +# This variable specifies the API level used for building Java code, it can be the same as Qt for +# Android's maximum supported Android version or higher. +if(NOT QT_ANDROID_API_USED_FOR_JAVA) + set(QT_ANDROID_API_USED_FOR_JAVA "android-34") +endif() - if("${latest_platform_version}" VERSION_GREATER "${required_platform_version}") +set(jar_location "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_USED_FOR_JAVA}/android.jar") +if(NOT EXISTS "${jar_location}") + _qt_internal_detect_latest_android_platform(android_platform_latest) + if(android_platform_latest) + message(NOTICE "The default platform SDK ${QT_ANDROID_API_USED_FOR_JAVA} not found, " + "using the latest installed ${android_platform_latest} instead.") set(QT_ANDROID_API_USED_FOR_JAVA ${android_platform_latest}) endif() endif() |