diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-18 12:56:02 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-11-18 12:00:50 +0000 |
| commit | 16f2f56b1d770f1e851fc689bd400892c7133a12 (patch) | |
| tree | 049b347ba874b9781a42d0aeeea7d64fd49253c9 /share | |
| parent | d6a9501fad89a1bb3df4b400e73d7814bddf863a (diff) | |
Android NDK module: Move I/O operation into Probe
Change-Id: If6884dc0c6625932ca50d7b035357b2df660e9dc
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs | 3 | ||||
| -rw-r--r-- | share/qbs/modules/Android/ndk/ndk.qbs | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs index 9f282c953..5673d2277 100644 --- a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs +++ b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs @@ -57,6 +57,7 @@ PathProbe { // Outputs property var hostArch + property stringList toolchains: [] configure: { var i, j, allPaths = (environmentPaths || []).concat(platformPaths || []); @@ -72,6 +73,8 @@ PathProbe { if (File.exists(FileInfo.joinPaths(allPaths[i], "prebuilt", platforms[j]))) { path = allPaths[i]; hostArch = platforms[j]; + toolchains = File.directoryEntries(FileInfo.joinPaths(path, "toolchains"), + File.Dirs | File.NoDotAndDotDot); found = true; return; } diff --git a/share/qbs/modules/Android/ndk/ndk.qbs b/share/qbs/modules/Android/ndk/ndk.qbs index 16f0fb845..05b3eeaf8 100644 --- a/share/qbs/modules/Android/ndk/ndk.qbs +++ b/share/qbs/modules/Android/ndk/ndk.qbs @@ -70,9 +70,7 @@ Module { property string platform: "android-9" // Internal properties. - property stringList availableToolchains: File.directoryEntries( - FileInfo.joinPaths(ndkDir, "toolchains"), - File.Dirs | File.NoDotAndDotDot) + property stringList availableToolchains: ndkProbe.toolchains property stringList availableToolchainVersions: { var tcs = availableToolchains; |