Copy Android files from the application source in aux mode

The application provided overrides of the Android files were not being
used in aux mode. In aux mode androiddeployqt was only copying the
Android files from the Qt sources and updating them.

With this change androiddeployqt also copies the Android files from the
application source, allowing overrides prior to template processing.

Change-Id: Idf790f1c270691dab8fe093c20e84bed79bf481d
Reviewed-by: Assam Boudjelthia <[email protected]>

1 files changed, 6 insertions, 7 deletions

diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp
index 946314fab5a..62cdb345e57 100644
--- a/src/tools/androiddeployqt/main.cpp
+++ b/src/tools/androiddeployqt/main.cpp
@@ -4092,13 +4092,7 @@ int main(int argc, char *argv[])
     if (!createRcc(options))
         return CannotCreateRcc;
 
-    if (options.auxMode) {
-        if (!updateAndroidFiles(options))
-            return CannotUpdateAndroidFiles;
-        return 0;
-    }
-
-    if (options.build) {
+    if (options.auxMode || options.build) {
         if (!copyAndroidSources(options))
             return CannotCopyAndroidSources;
 
@@ -4110,7 +4104,12 @@ int main(int argc, char *argv[])
 
         if (Q_UNLIKELY(options.timing))
             fprintf(stdout, "[TIMING] %lld ns: Updated files\n", options.timer.nsecsElapsed());
+    }
 
+    if (options.auxMode)
+        return 0;
+
+    if (options.build) {
         if (Q_UNLIKELY(options.timing))
             fprintf(stdout, "[TIMING] %lld ns: Created project\n", options.timer.nsecsElapsed());