From 2028b80b6b1fa726f428378d2cabfd01ddc2521d Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Sun, 3 Oct 2021 14:11:01 +0300 Subject: [PATCH] CMake: Allow providing custom QT_ANDROID_SDK_BUILD_TOOLS_REVISION The current CMake configuration sets QT_ANDROID_SDK_BUILD_TOOLS_REVISION only internally, taking the latest build-tools found. A project might still want to manually set specific build-tools version. Pick-to: 6.2 Task-number: QTBUG-97002 Change-Id: I553563638160fdef7a27b9b334d1d9aae5d8b7e1 Reviewed-by: Alexandru Croitor --- src/corelib/Qt6AndroidMacros.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index ddcc184677..99c41fc733 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -98,9 +98,12 @@ function(qt6_android_generate_deployment_settings target) " \"sdk\": \"${android_sdk_root_native}\",\n") # Android SDK Build Tools Revision - _qt_internal_android_get_sdk_build_tools_revision(QT_ANDROID_SDK_BUILD_TOOLS_REVISION) + get_target_property(android_sdk_build_tools ${target} QT_ANDROID_SDK_BUILD_TOOLS_REVISION) + if (NOT android_sdk_build_tools) + _qt_internal_android_get_sdk_build_tools_revision(android_sdk_build_tools) + endif() string(APPEND file_contents - " \"sdkBuildToolsRevision\": \"${QT_ANDROID_SDK_BUILD_TOOLS_REVISION}\",\n") + " \"sdkBuildToolsRevision\": \"${android_sdk_build_tools}\",\n") # Android NDK file(TO_CMAKE_PATH "${CMAKE_ANDROID_NDK}" android_ndk_root_native)