diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-12-13 22:17:08 -0800 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-12-15 09:44:46 +0000 |
| commit | 8815e0007006e996bc145a91970d71b9b4ae86d0 (patch) | |
| tree | a60b013279eef1ee9becccc9925234319998bb75 | |
| parent | f9cf08ce9f202eac83c8d0dc2c1ec68e4d2fcdea (diff) | |
Fix Android builds in release mode with NDK r12 and above
Task-number: QBS-1256
Change-Id: I286327f8b33ecb72851551bbbf2108717a116b1a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
| -rw-r--r-- | changelogs/changes-1.10.1.md | 1 | ||||
| -rw-r--r-- | share/qbs/modules/Android/ndk/ndk.qbs | 2 | ||||
| -rw-r--r-- | share/qbs/modules/cpp/android-gcc.qbs | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/changelogs/changes-1.10.1.md b/changelogs/changes-1.10.1.md index a288a9fe6..ffcf8c9e1 100644 --- a/changelogs/changes-1.10.1.md +++ b/changelogs/changes-1.10.1.md @@ -4,3 +4,4 @@ * Fix GCC support for "bare metal" systems (QBS-1263). * Fix using ids in Depends items (QBS-1264). * Fix race condition when creating Inno Setup, NSIS, or WiX installers. +* Fix release builds for Android with NDK r12 and above (QBS-1256). diff --git a/share/qbs/modules/Android/ndk/ndk.qbs b/share/qbs/modules/Android/ndk/ndk.qbs index b347971f3..6141ebda9 100644 --- a/share/qbs/modules/Android/ndk/ndk.qbs +++ b/share/qbs/modules/Android/ndk/ndk.qbs @@ -156,6 +156,8 @@ Module { allowedValues: ["arm", "thumb"] } + property bool haveUnifiedStl: version && Utilities.versionCompare(version, "12") >= 0 + validate: { var validator = new ModUtils.PropertyValidator("Android.ndk"); validator.setRequiredProperty("abi", abi); diff --git a/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs index 2c18ed02c..c50dc9f1f 100644 --- a/share/qbs/modules/cpp/android-gcc.qbs +++ b/share/qbs/modules/cpp/android-gcc.qbs @@ -72,7 +72,7 @@ LinuxGCC { property string stlLibsDir: { if (stlBaseDir) { var infix = Android.ndk.abi; - if (Android.ndk.armMode === "thumb") + if (Android.ndk.armMode === "thumb" && !Android.ndk.haveUnifiedStl) infix = FileInfo.joinPaths(infix, "thumb"); return FileInfo.joinPaths(stlBaseDir, "libs", infix); } |