From 4ec2d31d1879f0b63a04720721659318e5866eca Mon Sep 17 00:00:00 2001
From: Alexey Edelev <alexey.edelev@qt.io>
Date: Thu, 28 Nov 2024 15:28:50 +0100
Subject: [PATCH] Use add_dependencies to add the Android custom target
 dependencies

According to the CMake documentation we should use the add_dependencies
command to add dependencies on other targets for targets created
using the add_custom_target call.
Adjust the code for the Android targets.

Task-number: QTBUG-131653
Pick-to: 6.5
Change-Id: Iec9a3036f34f065f067568ecfca838345d35ff93
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 312717d821aea191bd61285b2bf21ef11c509318)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/corelib/Qt6AndroidMacros.cmake | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/corelib/Qt6AndroidMacros.cmake b/src/corelib/Qt6AndroidMacros.cmake
index 7686a56889..55824e3101 100644
--- a/src/corelib/Qt6AndroidMacros.cmake
+++ b/src/corelib/Qt6AndroidMacros.cmake
@@ -464,11 +464,11 @@ function(qt6_android_add_apk_target target)
         "${apk_final_dir}/${target_file_copy_relative_path}"
     )
     add_custom_target(${target}_prepare_apk_dir ALL
-        DEPENDS ${target} ${extra_deps}
         COMMAND ${copy_command}
         COMMENT "Copying ${target} binary to apk folder"
         ${uses_terminal}
     )
+    add_dependencies(${target}_prepare_apk_dir ${target} ${extra_deps})
 
     set(sign_apk "")
     if(QT_ANDROID_SIGN_APK)
@@ -564,7 +564,6 @@ function(qt6_android_add_apk_target target)
         add_custom_target(${target}_make_aar DEPENDS "${aar_final_file_path}")
     else()
         add_custom_target(${target}_make_apk
-            DEPENDS ${target}_prepare_apk_dir
             COMMAND  ${deployment_tool}
                 --input ${deployment_file}
                 --output ${apk_final_dir}
@@ -577,7 +576,6 @@ function(qt6_android_add_apk_target target)
         )
 
         add_custom_target(${target}_make_aar
-            DEPENDS ${target}_prepare_apk_dir
             COMMAND  ${deployment_tool}
                 --input ${deployment_file}
                 --output ${apk_final_dir}
@@ -588,13 +586,15 @@ function(qt6_android_add_apk_target target)
             VERBATIM
             ${uses_terminal}
         )
+
+        add_dependencies(${target}_make_apk ${target}_prepare_apk_dir)
+        add_dependencies(${target}_make_aar ${target}_prepare_apk_dir)
     endif()
 
     # Add target triggering AAB creation. Since the _make_aab target is not added to the ALL
     # set, we may avoid dependency check for it and admit that the target is "always out
     # of date".
     add_custom_target(${target}_make_aab
-        DEPENDS ${target}_prepare_apk_dir
         COMMAND  ${deployment_tool}
             --input ${deployment_file}
             --output ${apk_final_dir}
@@ -605,6 +605,7 @@ function(qt6_android_add_apk_target target)
         COMMENT "Creating AAB for ${target}"
         ${uses_terminal}
     )
+    add_dependencies(${target}_make_aab ${target}_prepare_apk_dir)
 
     if(QT_IS_ANDROID_MULTI_ABI_EXTERNAL_PROJECT)
         # When building per-ABI external projects we only need to copy ABI-specific libraries and