diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-03-06 19:47:20 +0900 |
|---|---|---|
| committer | Ken Wakasa <kwakasa@google.com> | 2014-03-06 20:32:20 +0900 |
| commit | ca0a0da8640d1469cb460120ff0aede2322c6802 (patch) | |
| tree | 00e339f41f4b1381d6171d59a4fc21e1a6187047 /native/jni/Android.mk | |
| parent | 51523c3bc4147e07e787a952ef64a326b5bccafa (diff) | |
| download | latinime-ca0a0da8640d1469cb460120ff0aede2322c6802.tar.gz latinime-ca0a0da8640d1469cb460120ff0aede2322c6802.tar.xz latinime-ca0a0da8640d1469cb460120ff0aede2322c6802.zip | |
Switch to C++11
Change-Id: Ib2970327c36422d7b11103d52ba7e9e52db5554f
Diffstat (limited to 'native/jni/Android.mk')
| -rw-r--r-- | native/jni/Android.mk | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 3b3da96cc..9657b9d65 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -31,15 +31,12 @@ LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-ali -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls \ -Woverloaded-virtual -Wstrict-null-sentinel -Wsign-promo -Wno-system-headers -ifeq ($(TARGET_ARCH), arm) -ifeq ($(TARGET_GCC_VERSION), 4.6) -LOCAL_CFLAGS += -Winline -endif # TARGET_GCC_VERSION -endif # TARGET_ARCH - # To suppress compiler warnings for unused variables/functions used for debug features etc. LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function +# For C++11 +LOCAL_CFLAGS += -std=c++11 + include $(LOCAL_PATH)/NativeFileList.mk LOCAL_SRC_FILES := \ @@ -64,7 +61,7 @@ LOCAL_MODULE := libjni_latinime_common_static LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 14 -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := gnustl_static include $(BUILD_STATIC_LIBRARY) ###################################### @@ -87,7 +84,7 @@ LOCAL_MODULE := libjni_latinime LOCAL_MODULE_TAGS := optional LOCAL_SDK_VERSION := 14 -LOCAL_NDK_STL_VARIANT := stlport_static +LOCAL_NDK_STL_VARIANT := gnustl_static LOCAL_LDFLAGS += -ldl include $(BUILD_SHARED_LIBRARY) |