From 1ede39907dd7951576315e6d50117c8813072ddf Mon Sep 17 00:00:00 2001
From: Remek Zajac <remek@airmap.com>
Date: Sat, 15 Aug 2020 16:15:15 +0200
Subject: [PATCH] Specify dependency target for Java sources in custom folder

---
 android.pri | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/android.pri b/android.pri
index b282d988f..83f574f22 100644
--- a/android.pri
+++ b/android.pri
@@ -7,9 +7,13 @@ exists($$PWD/custom/android) {
     message("Merging $$PWD/custom/android/ -> $$PWD/android/")
     ANDROID_PACKAGE_SOURCE_DIR = $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR
 
-    system($$QMAKE_MKDIR $$ANDROID_PACKAGE_SOURCE_DIR)
-    system($$QMAKE_COPY_DIR $$PWD/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR)
-    system($$QMAKE_COPY_DIR $$PWD/custom/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR)
+    javaforce.target = custom_android
+    javaforce.commands = $$QMAKE_MKDIR $$ANDROID_PACKAGE_SOURCE_DIR && \
+                         $$QMAKE_COPY_DIR $$PWD/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR && \
+                         $$QMAKE_COPY_DIR $$PWD/custom/android/* $$OUT_PWD/ANDROID_PACKAGE_SOURCE_DIR
+    javaforce.depends = FORCE
+    PRE_TARGETDEPS += $$javaforce.target
+    QMAKE_EXTRA_TARGETS += javaforce
 }
 
 exists($$PWD/custom/android/AndroidManifest.xml) {
-- 
2.22.0