diff options
| author | BogDan Vatra <bogdan@kde.org> | 2019-04-25 14:51:48 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2019-04-26 08:49:03 +0000 |
| commit | b381775da143b8b9b5ac610bfd38485d341d7c19 (patch) | |
| tree | db9f391b35f502f1bc83ae7d9cae2f14877f949f /share/qbs/modules/Android/ndk/ndk.qbs | |
| parent | bc6baf2d986f771926e0bfd8f188f270f2ad8baa (diff) | |
Default to the minimum supported NDK API version
- android-16 will be used for 32 bit arm ABIs
- android-21 will be used for all 64 bit ABIs and x86. x86 has broken
wstring support in android-16 to android-19.
Change-Id: I38f6e6ec3f16c172cb0b061cfc4cc9efdb8f1700
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules/Android/ndk/ndk.qbs')
| -rw-r--r-- | share/qbs/modules/Android/ndk/ndk.qbs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/share/qbs/modules/Android/ndk/ndk.qbs b/share/qbs/modules/Android/ndk/ndk.qbs index d639fcb91..15cfb8f72 100644 --- a/share/qbs/modules/Android/ndk/ndk.qbs +++ b/share/qbs/modules/Android/ndk/ndk.qbs @@ -63,8 +63,16 @@ Module { property string hostArch: ndkProbe.hostArch property string ndkDir: ndkProbe.path property string ndkSamplesDir: ndkProbe.samplesDir - property string platform: ndkProbe.ndkPlatform - + property string platform: { + switch (abi) { + case "armeabi": + case "armeabi-v7a": + // case "x86": // x86 has broken wstring support + return "android-19"; + default: + return "android-21"; + } + } property int platformVersion: { if (platform) { |