diff options
author | Jake Petroules <jake.petroules@qt.io> | 2018-01-22 21:00:24 -0800 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2018-01-25 16:14:15 +0000 |
commit | daba827d0c1e9f69bc62260b24aa1691bdb9ff52 (patch) | |
tree | 4a33e83a57f1d1ff344655f77c1b1b3d6c0a0208 /share/qbs/imports/qbs/Probes | |
parent | 5423eed454e89b250ba69a5fb2f53ea29aed421f (diff) |
Fix detection of Android SDK on Windows
Task-number: QBS-1282
Change-Id: If15e1ad616c6ffcdc03f62d872c512fd52c844d3
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs/Probes')
-rw-r--r-- | share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs | 22 |
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 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; + } } } } |