Merge 1.10 into 1.11

Change-Id: Ib49f863008a9c4a3b8956686de019e2f133c244f

1 files changed, 13 insertions, 9 deletions

diff --git a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
index f8d1eff60..1dc2a4919 100644
--- a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs
@@ -34,7 +34,7 @@ import qbs.File
 import qbs.FileInfo
 import "../../../modules/Android/sdk/utils.js" as SdkUtils
 
-PathProbe {
+BinaryProbe {
     environmentPaths: Environment.getEnv("ANDROID_HOME")
     platformPaths: {
         if (qbs.hostOS.contains("windows"))
@@ -53,17 +53,21 @@ PathProbe {
     property string platform
 
     configure: {
+        var suffixes = nameSuffixes || [""];
         var i, allPaths = (environmentPaths || []).concat(platformPaths || []);
         candidatePaths = allPaths;
         for (i in allPaths) {
-            if (File.exists(FileInfo.joinPaths(allPaths[i], "tools", "android"))) {
-                path = allPaths[i];
-                buildToolsVersions = SdkUtils.availableBuildToolsVersions(path)
-                buildToolsVersion = buildToolsVersions[buildToolsVersions.length - 1];
-                platforms = SdkUtils.availableSdkPlatforms(path)
-                platform = platforms[platforms.length - 1];
-                found = true;
-                return;
+            for (var j in suffixes) {
+                if (File.exists(FileInfo.joinPaths(allPaths[i],
+                                                   "tools", "android" + suffixes[j]))) {
+                    path = allPaths[i];
+                    buildToolsVersions = SdkUtils.availableBuildToolsVersions(path)
+                    buildToolsVersion = buildToolsVersions[buildToolsVersions.length - 1];
+                    platforms = SdkUtils.availableSdkPlatforms(path)
+                    platform = platforms[platforms.length - 1];
+                    found = true;
+                    return;
+                }
             }
         }
     }