diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-04-04 10:31:53 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-04-05 07:34:42 +0000 |
| commit | e0c6f88fe51186eb6fc697ba74f60136bf2106e4 (patch) | |
| tree | 4bc7abe667fcf598054c8886d8172326278329be /share/qbs/imports/qbs | |
| parent | 412d81bca2bcb7bf36632770a256f6c6b80facee (diff) | |
Android: Auto-detect Android.ndk.platform
... the same way as Android.sdk.platform.
Change-Id: I974fdfd9f56f312cbd39ea155d87694622a9c0b8
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share/qbs/imports/qbs')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs | 5 | ||||
| -rw-r--r-- | share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs index d7c80144e..f7abce388 100644 --- a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs +++ b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs @@ -33,6 +33,7 @@ import qbs.Environment import qbs.File import qbs.FileInfo import qbs.TextFile +import "../../../modules/Android/android-utils.js" as AndroidUtils PathProbe { // Inputs @@ -62,6 +63,7 @@ PathProbe { property var hostArch property stringList toolchains: [] property string ndkVersion + property string ndkPlatform configure: { function readFileContent(filePath) { @@ -91,6 +93,9 @@ PathProbe { for (j in platforms) { if (File.exists(FileInfo.joinPaths(allPaths[i], "prebuilt", platforms[j]))) { path = allPaths[i]; + var ndkPlatforms = AndroidUtils.availablePlatforms(path); + if (ndkPlatforms.length > 0) + ndkPlatform = ndkPlatforms[ndkPlatforms.length - 1]; if (File.exists(FileInfo.joinPaths(path, "samples"))) samplesDir = FileInfo.joinPaths(path, "samples"); // removed in r11 hostArch = platforms[j]; diff --git a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs index 28a9c568a..38feecdfa 100644 --- a/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs +++ b/share/qbs/imports/qbs/Probes/AndroidSdkProbe.qbs @@ -32,6 +32,7 @@ import qbs.Environment import qbs.File import qbs.FileInfo import "../../../modules/Android/sdk/utils.js" as SdkUtils +import "../../../modules/Android/android-utils.js" as AndroidUtils BinaryProbe { environmentPaths: Environment.getEnv("ANDROID_HOME") @@ -62,7 +63,7 @@ BinaryProbe { path = allPaths[i]; buildToolsVersions = SdkUtils.availableBuildToolsVersions(path) buildToolsVersion = buildToolsVersions[buildToolsVersions.length - 1]; - platforms = SdkUtils.availableSdkPlatforms(path) + platforms = AndroidUtils.availablePlatforms(path) platform = platforms[platforms.length - 1]; found = true; return; |