diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-10-12 14:37:13 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-11-21 23:07:28 +0000 |
| commit | 659eff9f2dbefaead70ff091b5ddaf1efb7f8c8f (patch) | |
| tree | d7e1ded7a4f756b61ade1d710843a3222752d795 /mkspecs | |
| parent | 175ada2249cd110ede45468b8c821706525695f8 (diff) | |
qmake: prune dead assignments from android spec
Change-Id: Ide2bbe7116c24c6b952db835c23ebf2859f18c5f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/android-base-head.conf | 4 | ||||
| -rw-r--r-- | mkspecs/common/android-base-tail.conf | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/mkspecs/common/android-base-head.conf b/mkspecs/common/android-base-head.conf index 93e7ba3ed4..a43fc7f23e 100644 --- a/mkspecs/common/android-base-head.conf +++ b/mkspecs/common/android-base-head.conf @@ -67,10 +67,6 @@ CONFIG += $$ANDROID_PLATFORM QMAKE_CFLAGS = -D__ANDROID_API__=$$replace(ANDROID_PLATFORM, "android-", "") ANDROID_PLATFORM_ROOT_PATH = $$NDK_ROOT/platforms/$$ANDROID_PLATFORM/arch-$$ANDROID_ARCHITECTURE/ -ANDROID_PLATFORM_PATH = $$ANDROID_PLATFORM_ROOT_PATH/usr - -equals(ANDROID_TARGET_ARCH, x86_64)|equals(ANDROID_TARGET_ARCH, mips64): \ - QMAKE_ANDROID_PLATFORM_LIBDIR = $${QMAKE_ANDROID_PLATFORM_LIBDIR}64 CROSS_COMPILE = $$NDK_TOOLCHAIN_PATH/bin/$$NDK_TOOLS_PREFIX- diff --git a/mkspecs/common/android-base-tail.conf b/mkspecs/common/android-base-tail.conf index e239fa01c5..57f009f78f 100644 --- a/mkspecs/common/android-base-tail.conf +++ b/mkspecs/common/android-base-tail.conf @@ -69,7 +69,6 @@ QMAKE_LIBDIR_OPENGL = QMAKE_LINK_SHLIB = $$QMAKE_LINK QMAKE_LFLAGS = --sysroot=$$ANDROID_PLATFORM_ROOT_PATH -QMAKE_RPATHLINK = $$QMAKE_ANDROID_PLATFORM_LIBDIR QMAKE_LFLAGS_APP = -Wl,--no-undefined -Wl,-z,noexecstack -shared QMAKE_LFLAGS_SHLIB = -Wl,--no-undefined -Wl,-z,noexecstack -shared QMAKE_LFLAGS_PLUGIN = $$QMAKE_LFLAGS_SHLIB |