diff options
| author | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-05-12 23:39:08 +0200 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2020-05-13 10:30:13 +0000 |
| commit | 7e15ee6ab3bc585a9bbcda61f6b54dd763102b0a (patch) | |
| tree | 5bf46e46f0149a34817a4b602e215c8bf9acb582 /share/qbs/modules/cpp/android-gcc.qbs | |
| parent | 7b793fd28c25a64f53c97b701b56c15fe3b63114 (diff) | |
Android: clean flags
Update flags following those changes:
https://codereview.qt-project.org/c/qt/qtbase/+/268268
https://codereview.qt-project.org/c/qt/qtbase/+/271909
https://codereview.qt-project.org/c/qt/qtbase/+/278646
Remove support to ARMv5 (armeabi), MIPS, and MIPS64 because its support was ended in r17 and minimum ndk is r19...
Remove gdb server as it's not needed anymore since by qtcreator (since 4.9 IIRC)
From https://android.googlesource.com/platform/ndk/+/master/docs/BuildSystemMaintainers.md
Adding linker flags:
--build-id=sha1 : Additional Required Arguments section
--gc-sections : Controlling Binary Size section
Fixes: QBS-1496
Change-Id: Id522bf6bb736c58244aa511189f7acdd0525ab12
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'share/qbs/modules/cpp/android-gcc.qbs')
| -rw-r--r-- | share/qbs/modules/cpp/android-gcc.qbs | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/share/qbs/modules/cpp/android-gcc.qbs b/share/qbs/modules/cpp/android-gcc.qbs index 10190308a..f218a4991 100644 --- a/share/qbs/modules/cpp/android-gcc.qbs +++ b/share/qbs/modules/cpp/android-gcc.qbs @@ -67,15 +67,6 @@ LinuxGCC { fileTags: "android.stl" } - Group { - name: "gdbserver" - condition: qbs.buildVariant !== "release" && product.cpp.shouldLink - files: FileInfo.joinPaths(Android.ndk.ndkDir, "prebuilt", - "android-" + NdkUtils.abiNameToDirName(Android.ndk.abi), - "gdbserver", "gdbserver") - fileTags: "android.gdbserver" - } - toolchainInstallPath: FileInfo.joinPaths(Android.ndk.ndkDir, "toolchains", "llvm", "prebuilt", Android.ndk.hostArch, "bin") @@ -86,8 +77,6 @@ LinuxGCC { toolchainPrefix: undefined machineType: { - if (Android.ndk.abi === "armeabi") - return "armv5te"; if (Android.ndk.abi === "armeabi-v7a") return "armv7-a"; } |