From 072837660d43b0f83fa9ae405a4c36c0f3aa4519 Mon Sep 17 00:00:00 2001 From: Alberto Mardegan Date: Sat, 11 Jul 2020 17:39:14 +0300 Subject: Android: Do not fail if project contains multiple shared libraries Do not fail the detection of the main binary if the first two candidates do not match the product name. Simplify the logic to exclude all non-matching candidates except the first one. Change-Id: I5046d7e103a9130c602aa8991bb9853c6ff593dd Reviewed-by: Christian Kandeler --- share/qbs/module-providers/Qt/templates/android_support.qbs | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/share/qbs/module-providers/Qt/templates/android_support.qbs b/share/qbs/module-providers/Qt/templates/android_support.qbs index 2835a9336..410b05ff9 100644 --- a/share/qbs/module-providers/Qt/templates/android_support.qbs +++ b/share/qbs/module-providers/Qt/templates/android_support.qbs @@ -102,9 +102,8 @@ Module { targetArchitecture = theBinary.Android.ndk.abi; 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) { + continue; // This is not going to be a match } if (candidate.product.name === product.name && theBinary.product.name !== product.name) { -- cgit v1.2.3