diff options
author | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-26 15:42:25 +0100 |
---|---|---|
committer | Christian Kandeler <christian.kandeler@qt.io> | 2018-01-26 15:46:57 +0100 |
commit | a330850efb1b0f56bc0ea49c986757687c6a8054 (patch) | |
tree | 4a6701383c5cdc4cfab2596930022403692e2756 /share | |
parent | 112fa3d4c269faac41685d0de497afa9ba2b9621 (diff) | |
parent | daba827d0c1e9f69bc62260b24aa1691bdb9ff52 (diff) |
Merge 1.10 into 1.11
Change-Id: Ib49f863008a9c4a3b8956686de019e2f133c244f
Diffstat (limited to 'share')
-rw-r--r-- | share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs | 22 | ||||
-rw-r--r-- | share/qbs/modules/Android/ndk/ndk.qbs | 1 |
2 files changed, 13 insertions, 10 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; + } } } } diff --git a/share/qbs/modules/Android/ndk/ndk.qbs b/share/qbs/modules/Android/ndk/ndk.qbs index 5cd69ade3..226423d61 100644 --- a/share/qbs/modules/Android/ndk/ndk.qbs +++ b/share/qbs/modules/Android/ndk/ndk.qbs @@ -174,7 +174,6 @@ Module { validator.setRequiredProperty("appStl", appStl); validator.setRequiredProperty("toolchainVersion", toolchainVersion); validator.setRequiredProperty("hostArch", hostArch); - validator.setRequiredProperty("ndkDir", ndkDir); validator.setRequiredProperty("platform", platform); validator.setRequiredProperty("toolchainVersionNumber", toolchainVersionNumber); return validator.validate(); |