From 09e4baf5eb15e2ac1b98d389ea14debd014742b9 Mon Sep 17 00:00:00 2001 From: Alexey Edelev Date: Tue, 18 Feb 2025 12:52:18 +0100 Subject: [PATCH] Ensure _copy_apk_dependencies is called for QtC build 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 _prepare_apk_dir target. Make it depending on _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 Reviewed-by: Alexandru Croitor (cherry picked from commit 7a6b3e1a9c0555e91f3e510b63bc0cc18bb1ef16) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6AndroidMacros.cmake | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake index b202cfd66d4..c8d50d2b0a1 100644 --- a/src/corelib/Qt6AndroidMacros.cmake +++ b/src/corelib/Qt6AndroidMacros.cmake @@ -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})