Qt.android_support: Fix check for finding the main binary

Libraries from the app product should get higher precedence than those
from dependencies.

Change-Id: Id8bf723fd09e7a798e554f4dbaaae3c73815c1d4
Reviewed-by: Erik Schilling <ablu.erikschilling@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 17 insertions, 7 deletions

diff --git a/src/lib/qtprofilesetup/templates/android_support.qbs b/src/lib/qtprofilesetup/templates/android_support.qbs
index c4c4a51f0..79276a494 100644
--- a/src/lib/qtprofilesetup/templates/android_support.qbs
+++ b/src/lib/qtprofilesetup/templates/android_support.qbs
@@ -60,15 +60,25 @@ Module {
                 } else {
                     for (i = 0; i < nativeLibs.length; ++i) {
                         var candidate = nativeLibs[i];
-                        if (candidate.fileName.contains(candidate.product.targetName)) {
-                            if (theBinary) {
-                                throw "Qt applications for Android support only one native binary "
-                                        + "per package.\n"
-                                        + "In particular, you cannot build a Qt app for more than "
-                                        + "one architecture at the same time.";
-                            }
+                        if (!candidate.fileName.contains(candidate.product.targetName))
+                            continue;
+                        if (!theBinary) {
                             theBinary = candidate;
+                            continue;
                         }
+                        if (theBinary.product.name === product.name
+                                && candidate.product.name !== product.name) {
+                            continue; // We already have a better match.
+                        }
+                        if (candidate.product.name === product.name
+                                && theBinary.product.name !== product.name) {
+                            theBinary = candidate; // The new candidate is a better match.
+                            continue;
+                        }
+                        throw "Qt applications for Android support only one native binary "
+                                + "per package.\n"
+                                + "In particular, you cannot build a Qt app for more than "
+                                + "one architecture at the same time.";
                     }
                 }
                 var f = new TextFile(output.filePath, TextFile.WriteOnly);