From daba827d0c1e9f69bc62260b24aa1691bdb9ff52 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Mon, 22 Jan 2018 21:00:24 -0800 Subject: Fix detection of Android SDK on Windows Task-number: QBS-1282 Change-Id: If15e1ad616c6ffcdc03f62d872c512fd52c844d3 Reviewed-by: Denis Shienkov Reviewed-by: Christian Kandeler --- share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs index b3f96ca3b..ea4146c12 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")) @@ -52,17 +52,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; + } } } } -- cgit v1.2.3