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/imports/qbs/Probes | |
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/imports/qbs/Probes')
-rw-r--r-- | share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs index f7abce388..4a86ee935 100644 --- a/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs +++ b/share/qbs/imports/qbs/Probes/AndroidNdkProbe.qbs @@ -63,7 +63,6 @@ PathProbe { property var hostArch property stringList toolchains: [] property string ndkVersion - property string ndkPlatform configure: { function readFileContent(filePath) { @@ -93,9 +92,6 @@ 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]; |