diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2013-03-21 10:07:22 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:51:55 +0300 |
| commit | d12492ad47177fc79e5650979ef417a9241cafb3 (patch) | |
| tree | 1d973ffdd14930d42deb19f34edd148873bad2a7 /tools | |
| parent | 0ae8e4b9e093bc858ad17ca8907d8ff65322b541 (diff) | |
[android] Fixed ndk-stack for production builds
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mkspecs/android-g++/g++-base.conf | 2 | ||||
| -rw-r--r-- | tools/mkspecs/android-g++/g++-unix.conf | 4 | ||||
| -rw-r--r-- | tools/mkspecs/android-g++/qmake.conf | 3 |
3 files changed, 5 insertions, 4 deletions
diff --git a/tools/mkspecs/android-g++/g++-base.conf b/tools/mkspecs/android-g++/g++-base.conf index eb5b7d6188..c5ac598d63 100644 --- a/tools/mkspecs/android-g++/g++-base.conf +++ b/tools/mkspecs/android-g++/g++-base.conf @@ -13,7 +13,7 @@ QMAKE_CC = gcc QMAKE_LINK_C = $$QMAKE_CC QMAKE_LINK_C_SHLIB = $$QMAKE_CC -QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += -O2 -g +QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO *= -O3 -g QMAKE_CXX = g++ diff --git a/tools/mkspecs/android-g++/g++-unix.conf b/tools/mkspecs/android-g++/g++-unix.conf index 96e301e8fa..11c67cf64c 100644 --- a/tools/mkspecs/android-g++/g++-unix.conf +++ b/tools/mkspecs/android-g++/g++-unix.conf @@ -10,5 +10,5 @@ include(g++-base.conf) -QMAKE_LFLAGS_RELEASE += -Wl,-O1 -QMAKE_LFLAGS_NOUNDEF += -Wl,--no-undefined +QMAKE_LFLAGS_RELEASE *= -Wl,-O3 +QMAKE_LFLAGS_NOUNDEF *= -Wl,--no-undefined diff --git a/tools/mkspecs/android-g++/qmake.conf b/tools/mkspecs/android-g++/qmake.conf index 80a599665d..0021cfad93 100644 --- a/tools/mkspecs/android-g++/qmake.conf +++ b/tools/mkspecs/android-g++/qmake.conf @@ -52,7 +52,8 @@ QMAKE_CC = $$NDK_TOOLCHAIN_PATH/bin/$$ANDROID_CC_PREFIX-gcc QMAKE_CFLAGS += --sysroot=$$ANDROID_PLATFORM_ROOT_PATH -ffunction-sections -fdata-sections -fomit-frame-pointer -DANDROID -Wno-psabi #QMAKE_CFLAGS += -funwind-tables QMAKE_CFLAGS_DEBUG += -fstack-protector -O0 -g -QMAKE_CFLAGS_RELEASE += -O3 +# We have -g in release/production because android strips symbols automatically and leaves unstripped libs too to decode crash logs with ndk-stack +QMAKE_CFLAGS_RELEASE *= -O3 -g contains(ANDROID_TARGET_ARCH, arm) { QMAKE_CFLAGS += -fpic -D__ARM_ARCH_5__ -D__ARM_ARCH_5T__ -D__ARM_ARCH_5E__ -D__ARM_ARCH_5TE__ -Wno-psabi -mthumb -fno-strict-aliasing -finline-limit=64 -Wa,--noexecstack contains(ANDROID_TARGET_ABI, armeabi-v7a): QMAKE_CFLAGS += -march=armv7-a -mfloat-abi=softfp -mfpu=vfp |