diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2012-11-07 22:24:23 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:46:41 +0300 |
| commit | 9c4d6350e9c29b61c5f9d74c648dd832fd3dfdec (patch) | |
| tree | d3d9259794bd51d531e4a019b706f6b2d2af4e6e | |
| parent | 5d224dad06e09ae60de8ebcc44ffc54c942424d6 (diff) | |
[android] Fixed compilation warning about va_list mangling
| -rw-r--r-- | android/jni/Android.mk | 2 | ||||
| -rw-r--r-- | tools/mkspecs/android-g++/qmake.conf | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/android/jni/Android.mk b/android/jni/Android.mk index a2215d777c..c7f59dda8e 100644 --- a/android/jni/Android.mk +++ b/android/jni/Android.mk @@ -6,7 +6,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := mapswithme -LOCAL_CFLAGS := -ffunction-sections -fdata-sections +LOCAL_CFLAGS := -ffunction-sections -fdata-sections -Wno-psabi TARGET_PLATFORM := android-5 diff --git a/tools/mkspecs/android-g++/qmake.conf b/tools/mkspecs/android-g++/qmake.conf index ba7fe7df2c..6e3d357438 100644 --- a/tools/mkspecs/android-g++/qmake.conf +++ b/tools/mkspecs/android-g++/qmake.conf @@ -49,7 +49,7 @@ ANDROID_SOURCES_CXX_STL_INCDIR = $$(NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/$$TO 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 +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 |