diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-05-27 09:00:21 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-05-30 14:50:53 +0000 |
| commit | b13a5e2a07764dbf92736a2c89e65af0d26c4556 (patch) | |
| tree | 4891901c267daa993b7aaa297cfd1fc66dbb5a25 /share/qbs/modules/Android | |
| parent | a66281bec7dca8a0c733ecc4c61bc0415c0a3dfa (diff) | |
Add properties to indicate the Android NDK samples directory
This was removed from the actual NDK in r11, and so can be set to the
external googlesamples/android-ndk repository on github.com.
Change-Id: Ie47883ebd003c119583b4a3321041ebbbf401029
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules/Android')
| -rw-r--r-- | share/qbs/modules/Android/ndk/ndk.qbs | 1 | ||||
| -rw-r--r-- | share/qbs/modules/Android/sdk/sdk.qbs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/modules/Android/ndk/ndk.qbs b/share/qbs/modules/Android/ndk/ndk.qbs index 3063fcf29..aee0b30ba 100644 --- a/share/qbs/modules/Android/ndk/ndk.qbs +++ b/share/qbs/modules/Android/ndk/ndk.qbs @@ -70,6 +70,7 @@ Module { property string hostArch: ndkProbe.hostArch property string ndkDir: ndkProbe.path + property string ndkSamplesDir: ndkProbe.samplesDir property string platform: "android-9" property bool useUnifiedHeaders: Utilities.versionCompare(version, "14") >= 0 diff --git a/share/qbs/modules/Android/sdk/sdk.qbs b/share/qbs/modules/Android/sdk/sdk.qbs index d07c2778f..bca52a203 100644 --- a/share/qbs/modules/Android/sdk/sdk.qbs +++ b/share/qbs/modules/Android/sdk/sdk.qbs @@ -51,6 +51,7 @@ Module { property path sdkDir: sdkProbe.path property path ndkDir: ndkProbe.path + property path ndkSamplesDir: ndkProbe.samplesDir property string buildToolsVersion: sdkProbe.buildToolsVersion property var buildToolsVersionParts: buildToolsVersion ? buildToolsVersion.split('.').map(function(item) { return parseInt(item, 10); }) : [] property int buildToolsVersionMajor: buildToolsVersionParts[0] |