Merge remote-tracking branch 'origin/5.6' into dev

Change-Id: Ie5e9e73a136892cbd02498cca7cd782b50187ddf

1 files changed, 9 insertions, 7 deletions

diff --git a/src/androiddeployqt/main.cpp b/src/androiddeployqt/main.cpp
index 58214aa0b..74e4f8f1f 100644
--- a/src/androiddeployqt/main.cpp
+++ b/src/androiddeployqt/main.cpp
@@ -2692,7 +2692,9 @@ bool copyGdbServer(const Options &options)
         fprintf(stdout, "Copying gdbserver into package.\n");
 
     QString architectureSubDirectory;
-    if (options.architecture.startsWith(QLatin1String("arm")))
+    if (options.architecture == QLatin1String("arm64-v8a"))
+        architectureSubDirectory = QLatin1String("android-arm64");
+    else if (options.architecture.startsWith(QLatin1String("arm")))
         architectureSubDirectory = QLatin1String("android-arm");
     else
         architectureSubDirectory = QLatin1String("android-") + options.architecture;
@@ -2904,12 +2906,6 @@ int main(int argc, char *argv[])
         if (Q_UNLIKELY(options.timing))
             fprintf(stdout, "[TIMING] %d ms: Copied GDB server\n", options.timer.elapsed());
 
-        if (!stripLibraries(options))
-            return CannotStripLibraries;
-
-        if (Q_UNLIKELY(options.timing))
-            fprintf(stdout, "[TIMING] %d ms: Stripped libraries\n", options.timer.elapsed());
-
         if (!copyAndroidExtraLibs(options))
             return CannotCopyAndroidExtraLibs;
 
@@ -2925,6 +2921,12 @@ int main(int argc, char *argv[])
         if (Q_UNLIKELY(options.timing))
             fprintf(stdout, "[TIMING] %d ms: Copied android sources\n", options.timer.elapsed());
 
+        if (!stripLibraries(options))
+            return CannotStripLibraries;
+
+        if (Q_UNLIKELY(options.timing))
+            fprintf(stdout, "[TIMING] %d ms: Stripped libraries\n", options.timer.elapsed());
+
         if (!updateAndroidFiles(options))
             return CannotUpdateAndroidFiles;