diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2016-06-30 20:07:27 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2016-07-30 04:27:23 +0000 |
| commit | 7e5cf659f1539c27c150b1c4d60dd54c9b3e180f (patch) | |
| tree | ddfbfc2247c7189591708891e66612f2e52a6c5f /share/qbs/modules/cpp/android-gcc.qbs | |
| parent | a3466fc55fb7756fcc9ddd6aeabbdef80c0108e4 (diff) | |
Get rid of Android hard float "ABI"
This was never recommended for use, and has been removed in the latest
Android NDK r12. See https://github.com/android-ndk/ndk/blob/master/docs/HardFloatAbi.md
for full details on the matter.
Task-number: QBS-989
Change-Id: I49fd1b7527d43e8b6caa2b905a41a6f0b1e5b4af
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'share/qbs/modules/cpp/android-gcc.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/android-gcc.qbs | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs index c42f78578..ad8437a21 100644 --- a/share/qbs/modules/cpp/android-gcc.qbs +++ b/share/qbs/modules/cpp/android-gcc.qbs @@ -70,7 +70,7 @@ LinuxGCC { property string stlLibsDir: { if (stlBaseDir) { - var infix = Android.ndk.buildProfile; + var infix = Android.ndk.abi; if (Android.ndk.armMode === "thumb") infix = FileInfo.joinPaths(infix, "thumb"); return FileInfo.joinPaths(stlBaseDir, "libs", infix); @@ -109,9 +109,9 @@ LinuxGCC { enableRtti: Android.ndk.appStl !== "system" commonCompilerFlags: NdkUtils.commonCompilerFlags(qbs.buildVariant, Android.ndk.abi, - Android.ndk.hardFloat, Android.ndk.armMode) + Android.ndk.armMode) - linkerFlags: NdkUtils.commonLinkerFlags(Android.ndk.abi, Android.ndk.hardFloat) + linkerFlags: NdkUtils.commonLinkerFlags(Android.ndk.abi) libraryPaths: { var prefix = FileInfo.joinPaths(sysroot, "usr"); @@ -123,17 +123,13 @@ LinuxGCC { } dynamicLibraries: { - var libs = ["c"]; - if (!Android.ndk.hardFloat) - libs.push("m"); + var libs = ["c", "m"]; if (sharedStlFilePath) libs.push(sharedStlFilePath); return libs; } staticLibraries: { var libs = ["gcc"]; - if (Android.ndk.hardFloat) - libs.push("m_hard"); if (staticStlFilePath) libs.push(staticStlFilePath); return libs; @@ -148,7 +144,7 @@ LinuxGCC { includes.push(FileInfo.joinPaths(stlPortBaseDir, "stlport")); } else if (Android.ndk.appStl.startsWith("gnustl")) { includes.push(FileInfo.joinPaths(gnuStlBaseDir, "include")); - includes.push(FileInfo.joinPaths(gnuStlBaseDir, "libs", Android.ndk.buildProfile, "include")); + includes.push(FileInfo.joinPaths(gnuStlBaseDir, "libs", Android.ndk.abi, "include")); includes.push(FileInfo.joinPaths(gnuStlBaseDir, "include", "backward")); } else if (Android.ndk.appStl.startsWith("c++_")) { includes.push(FileInfo.joinPaths(llvmStlBaseDir, "libcxx", "include")); @@ -156,12 +152,7 @@ LinuxGCC { } return includes; } - defines: { - var list = ["ANDROID"]; - if (Android.ndk.hardFloat) - list.push("_NDK_MATH_NO_SOFTFP=1"); - return list; - } + defines: ["ANDROID"] sysroot: FileInfo.joinPaths(Android.ndk.ndkDir, "platforms", Android.ndk.platform, "arch-" + NdkUtils.abiNameToDirName(Android.ndk.abi)) |