From 2f30e9d75195e01024df5df2ccdca4067fd448d5 Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Mon, 13 Dec 2021 12:36:03 +0100
Subject: [PATCH] Use the highest-available android SDK version as the 'target'
 SDK

When building Qt we want to use the highest available 'target' SDK
version. If the version of the available SDK is lower than the minimum
required 'target' SDK version, we need to throw an error.

Pick-to: 6.2 6.3
Fixes: QTBUG-99165
Task-number: QTBUG-98870
Change-Id: Ib75567a6f33ac6d23d9f79e8ed8535839c08b91d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
---
 cmake/QtPlatformAndroid.cmake | 41 ++++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/cmake/QtPlatformAndroid.cmake b/cmake/QtPlatformAndroid.cmake
index eef6940886c..6e074773325 100644
--- a/cmake/QtPlatformAndroid.cmake
+++ b/cmake/QtPlatformAndroid.cmake
@@ -62,26 +62,37 @@ function(qt_internal_sort_android_platforms out_var)
     set("${out_var}" "${platforms}" PARENT_SCOPE)
 endfunction()
 
-# Locate android.jar
-set(QT_ANDROID_JAR "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_VERSION}/android.jar")
-if(NOT EXISTS "${QT_ANDROID_JAR}")
-    # Locate the highest available platform
-    file(GLOB android_platforms
-        LIST_DIRECTORIES true
-        RELATIVE "${ANDROID_SDK_ROOT}/platforms"
-        "${ANDROID_SDK_ROOT}/platforms/*")
-    # If list is not empty
-    if(android_platforms)
-        qt_internal_sort_android_platforms(android_platforms ${android_platforms})
-        list(REVERSE android_platforms)
-        list(GET android_platforms 0 android_platform_latest)
+macro(qt_internal_get_android_platform_version out_var android_platform)
+    string(REGEX REPLACE ".*-([0-9]+)$" "\\1" ${out_var} "${android_platform}")
+endmacro()
+
+# Locate the highest available platform
+file(GLOB android_platforms
+    LIST_DIRECTORIES true
+    RELATIVE "${ANDROID_SDK_ROOT}/platforms"
+    "${ANDROID_SDK_ROOT}/platforms/*")
+# If list is not empty
+if(android_platforms)
+    qt_internal_sort_android_platforms(android_platforms ${android_platforms})
+    list(REVERSE android_platforms)
+    list(GET android_platforms 0 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_VERSION}")
+
+    if("${latest_platform_version}" VERSION_GREATER "${required_platform_version}")
         set(QT_ANDROID_API_VERSION ${android_platform_latest})
-        set(QT_ANDROID_JAR "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_VERSION}/android.jar")
     endif()
 endif()
 
+set(QT_ANDROID_JAR "${ANDROID_SDK_ROOT}/platforms/${QT_ANDROID_API_VERSION}/android.jar")
 if(NOT EXISTS "${QT_ANDROID_JAR}")
-    message(FATAL_ERROR "No suitable Android SDK platform found. Minimum version is ${QT_ANDROID_API_VERSION}")
+    message(FATAL_ERROR
+        "No suitable Android SDK platform found in '${ANDROID_SDK_ROOT}/platforms'."
+        " Minimum version is ${QT_ANDROID_API_VERSION}"
+    )
 endif()
 
 message(STATUS "Using Android SDK API ${QT_ANDROID_API_VERSION} from ${ANDROID_SDK_ROOT}/platforms")