src/androiddeployqt/main.cpp

@@ -126,6 +126,7 @@ struct Options
     QString architecture;
     QString toolchainVersion;
     QString toolchainPrefix;
+    QString toolPrefix;
     QString ndkHost;
 
     // Package information
@@ -536,6 +537,16 @@ bool readInputFile(Options *options)
         options->toolchainPrefix = toolchainPrefix.toString();
     }
 
+    {
+        QJsonValue toolPrefix = jsonObject.value("tool-prefix");
+        if (toolPrefix.isUndefined()) {
+            fprintf(stderr, "Warning: No tool prefix defined in json file.\n");
+            options->toolPrefix = options->toolchainPrefix;
+        } else {
+            options->toolPrefix = toolPrefix.toString();
+        }
+    }
+
     {
         QJsonValue toolchainVersion = jsonObject.value("toolchain-version");
         if (toolchainVersion.isUndefined()) {
@@ -1094,7 +1105,7 @@ QStringList getQtLibsFromElf(const Options &options, const QString &fileName)
             + QLatin1String("/prebuilt/")
             + options.ndkHost
             + QLatin1String("/bin/")
-            + options.toolchainPrefix
+            + options.toolPrefix
             + QLatin1String("-readelf");
 #if defined(Q_OS_WIN32)
     readElf += QLatin1String(".exe");
@@ -1162,21 +1173,15 @@ bool readDependenciesFromElf(Options *options,
         options->qtDependencies.append(dependency);
         if (options->verbose)
             fprintf(stderr, "Appending dependency: %s\n", qPrintable(dependency));
-    }
-    // Add the implicit dependencies for later
-    foreach (QString dependency, dependencies) {
-        if (dependency.startsWith(QLatin1String("lib/lib")) && dependency.endsWith(QLatin1String(".so"))) {
-            QString qtBaseName = dependency.mid(sizeof("lib/lib") - 1);
-            qtBaseName = qtBaseName.left(qtBaseName.size() - (sizeof(".so") - 1));
-            if (!readAndroidDependencyXml(options, qtBaseName, usedDependencies, remainingDependencies)) {
-                return false;
-            }
+        QString qtBaseName = dependency.mid(sizeof("lib/lib") - 1);
+        qtBaseName = qtBaseName.left(qtBaseName.size() - (sizeof(".so") - 1));
+        if (!readAndroidDependencyXml(options, qtBaseName, usedDependencies, remainingDependencies)) {
+            return false;
         }
     }
     return true;
 }
 
-
 bool readDependencies(Options *options)
 {
     if (options->verbose)
@@ -1217,7 +1222,7 @@ bool stripFile(const Options &options, const QString &fileName)
             + QLatin1String("/prebuilt/")
             + options.ndkHost
             + QLatin1String("/bin/")
-            + options.toolchainPrefix
+            + options.toolPrefix
             + QLatin1String("-strip");
 #if defined(Q_OS_WIN32)
     strip += QLatin1String(".exe");

src/src.pro

@@ -14,8 +14,8 @@ qtHaveModule(widgets) {
     }
 }
 
-SUBDIRS += linguist \
-           qtpaths
+SUBDIRS += linguist
+!android|android_app: SUBDIRS += qtpaths
 
 mac {
     SUBDIRS += macdeployqt