From 1624783c5d25c544293a736d7424b18539e2a4d5 Mon Sep 17 00:00:00 2001
From: Don Gagne <don@thegagnes.com>
Date: Tue, 31 Oct 2023 21:03:38 +0000
Subject: [PATCH] Fix setup of ANDROID_PACKAGE_SOURCE_DIR

Remove double call to make

Specify androiddeployqt location

Revert "Specify androiddeployqt location"

This reverts commit cc307cf32f0e9040aa8256d8b2799f8ff9168b9c.

Revert "Remove double call to make"

This reverts commit 3fee0e92fc537bee6586f674b8bf58463f0257da.

Remove PRE_TARGETDEPS

Fix target dependency to prevent make loop
---
 android.pri | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/android.pri b/android.pri
index 641121f..43dbbf9 100644
--- a/android.pri
+++ b/android.pri
@@ -8,20 +8,23 @@ ANDROID_PACKAGE_CUSTOM_SOURCE_DIR   = $$PWD/custom/android                  # Or
 
 # We always move the package files to the ANDROID_PACKAGE_SOURCE_DIR build dir so we can modify the manifest as needed
 
-android_source_dir_target.target = $$ANDROID_PACKAGE_QGC_SOURCE_DIR/AndroidManifest.xml
+android_source_dir_target.target = $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml
 android_source_dir_target.commands = \
     $$QMAKE_MKDIR $$ANDROID_PACKAGE_SOURCE_DIR && \
     $$QMAKE_COPY_DIR $$ANDROID_PACKAGE_QGC_SOURCE_DIR/* $$ANDROID_PACKAGE_SOURCE_DIR
 PRE_TARGETDEPS += $$android_source_dir_target.target
 QMAKE_EXTRA_TARGETS += android_source_dir_target
-android_source_dir_target.depends = FORCE
+exists($$ANDROID_PACKAGE_CUSTOM_SOURCE_DIR/AndroidManifest.xml) {
+    android_source_dir_target.depends = $$ANDROID_PACKAGE_CUSTOM_SOURCE_DIR/AndroidManifest.xml
+} else {
+    android_source_dir_target.depends = $$ANDROID_PACKAGE_QGC_SOURCE_DIR/AndroidManifest.xml
+}
 
 # Custom builds can override android package file
 
 exists($$ANDROID_PACKAGE_CUSTOM_SOURCE_DIR) {
     message("Merging$$ $$ANDROID_PACKAGE_QGC_SOURCE_DIR and $$ANDROID_PACKAGE_CUSTOM_SOURCE_DIR to $$ANDROID_PACKAGE_SOURCE_DIR")
 
-    android_source_dir_target.target = $$ANDROID_PACKAGE_CUSTOM_SOURCE_DIR/AndroidManifest.xml
     android_source_dir_target.commands = $$android_source_dir_target.commands && \
             $$QMAKE_COPY_DIR $$ANDROID_PACKAGE_CUSTOM_SOURCE_DIR/* $$ANDROID_PACKAGE_SOURCE_DIR && \
             $$QMAKE_STREAM_EDITOR -i \"s/package=\\\"org.mavlink.qgroundcontrol\\\"/package=\\\"$$QGC_ANDROID_PACKAGE\\\"/\" $$ANDROID_PACKAGE_SOURCE_DIR/AndroidManifest.xml