diff --git a/android.pri b/android.pri index b282d988ff30b9d3d1f2a3f391d3fd686f84d27e..83f574f2230d6a66cfd10032d8c5c49f6d027082 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) {