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

Ensure <target>_copy_apk_dependencies is called for QtC build

Browse Source 
QtC doesn't use the make_[apk|aab|aar] targets, it runs the deployment
manually. The top-level android build target for QtC is the
<target>_prepare_apk_dir target. Make it depending on
<target>_copy_apk_dependencies target, to ensure that all abi-specific
artifacts are copied before running the deployment procedure, from
either QtC or command line.

Amends 44149f9d8b62b5343a5d06628b0c9588f035ccc2

Fixes: QTBUG-133810
Fixes: QTBUG-131862
Pick-to: 6.8
Change-Id: I4f3630798658a793b0c96a99fc4644ec1dd0504b
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 7a6b3e1a9c0555e91f3e510b63bc0cc18bb1ef16)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Alexey Edelev 2025-02-18 12:52:18 +01:00 committed by Qt Cherry-pick Bot
parent af7ca1d159
commit 09e4baf5eb
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/corelib/Qt6AndroidMacros.cmake
View File

@ -762,11 +762,8 @@ function(qt6_android_add_apk_target target)
)
endif()
else()
if(TARGET ${target}_copy_apk_dependencies)
add_dependencies(${target}_make_apk ${target}_copy_apk_dependencies)
add_dependencies(${target}_make_aab ${target}_copy_apk_dependencies)
add_dependencies(${target}_make_aar ${target}_copy_apk_dependencies)
endif()
add_dependencies(${target}_prepare_apk_dir
${target}_copy_apk_dependencies)
endif()
set_property(GLOBAL APPEND PROPERTY _qt_apk_targets ${target})