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

Move the genex that returns Android SDK tools revision to a function

Browse Source 
The genex will be generic, so make it accessible from function.

Pick-to: 6.8
Change-Id: I83246890e2d81f3cdbbd8fe2b93d59968623a889
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9819e9c2e0928094ffbb4daba3f01d8e04570b00)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2025-03-03 13:08:35 +01:00 committed by Qt Cherry-pick Bot
parent 91fc9fe796
commit 59905e0678
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/corelib/Qt6AndroidMacros.cmake
View File

@ -21,6 +21,22 @@ function(_qt_internal_android_get_sdk_build_tools_revision out_var)
set(${out_var} "${android_build_tools_latest}" PARENT_SCOPE) set(${out_var} "${android_build_tools_latest}" PARENT_SCOPE)
endfunction() endfunction()
# Returns the target specific Android SDK tools revision. The function falls
# back to the calculated value if the QT_ANDROID_SDK_BUILD_TOOLS_REVISION
# target property is not set.
function(_qt_internal_android_get_target_sdk_build_tools_revision out_var target)
_qt_internal_android_get_sdk_build_tools_revision(android_sdk_build_tools)
set(android_sdk_build_tools_genex "")
string(APPEND android_sdk_build_tools_genex
"$<IF:$<BOOL:$<TARGET_PROPERTY:${target},QT_ANDROID_SDK_BUILD_TOOLS_REVISION>>,"
"$<TARGET_PROPERTY:${target},QT_ANDROID_SDK_BUILD_TOOLS_REVISION>,"
"${android_sdk_build_tools}"
">"
)
set(${out_var} "${android_sdk_build_tools_genex}" PARENT_SCOPE)
endfunction()
# The function appends to the 'out_var' a 'json_property' that contains the 'tool' path. If 'tool' # The function appends to the 'out_var' a 'json_property' that contains the 'tool' path. If 'tool'
# target or its IMPORTED_LOCATION are not found the function displays warning, but is not failing # target or its IMPORTED_LOCATION are not found the function displays warning, but is not failing
# at the project configuring phase. # at the project configuring phase.
@ -179,14 +195,9 @@ function(qt6_android_generate_deployment_settings target)
" \"sdk\": \"${android_sdk_root_native}\",\n") " \"sdk\": \"${android_sdk_root_native}\",\n")
# Android SDK Build Tools Revision # Android SDK Build Tools Revision
_qt_internal_android_get_sdk_build_tools_revision(android_sdk_build_tools) _qt_internal_android_get_target_sdk_build_tools_revision(android_sdk_build_tools_genex
set(android_sdk_build_tools_genex "") ${target})
string(APPEND android_sdk_build_tools_genex
"$<IF:$<BOOL:$<TARGET_PROPERTY:${target},QT_ANDROID_SDK_BUILD_TOOLS_REVISION>>,"
"$<TARGET_PROPERTY:${target},QT_ANDROID_SDK_BUILD_TOOLS_REVISION>,"
"${android_sdk_build_tools}"
">"
)
string(APPEND file_contents string(APPEND file_contents
" \"sdkBuildToolsRevision\": \"${android_sdk_build_tools_genex}\",\n") " \"sdkBuildToolsRevision\": \"${android_sdk_build_tools_genex}\",\n")