gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Fixed ndk-stack for production builds

Browse source
This commit is contained in:
Alex Zolotarev 2013-03-21 09:07:22 +03:00 • committed by Alex Zolotarev
parent 0ae8e4b9e0
commit d12492ad47
3 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/mkspecs/android-g++/g++-base.conf
View file

@ -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++

4
tools/mkspecs/android-g++/g++-unix.conf
View file

@ -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

3
tools/mkspecs/android-g++/qmake.conf
View file

@ -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