From 46b6f6055134dd77dbe405c9d4f6cfb5c9b5ba11 Mon Sep 17 00:00:00 2001 From: Ken Wakasa Date: Tue, 18 Mar 2014 12:09:10 +0900 Subject: [PATCH] Switch to Clang and libc++ Change-Id: Id425997af58967e49094ab593ed8f0b70c72bbbc --- native/jni/Android.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 9657b9d65..afb32d1da 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -29,7 +29,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-align \ -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls \ - -Woverloaded-virtual -Wstrict-null-sentinel -Wsign-promo -Wno-system-headers + -Woverloaded-virtual -Wsign-promo -Wno-system-headers # To suppress compiler warnings for unused variables/functions used for debug features etc. LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function @@ -60,8 +60,9 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime_common_static LOCAL_MODULE_TAGS := optional +LOCAL_CLANG := true LOCAL_SDK_VERSION := 14 -LOCAL_NDK_STL_VARIANT := gnustl_static +LOCAL_NDK_STL_VARIANT := c++_static include $(BUILD_STATIC_LIBRARY) ###################################### @@ -83,8 +84,9 @@ endif # FLAG_DO_PROFILE LOCAL_MODULE := libjni_latinime LOCAL_MODULE_TAGS := optional +LOCAL_CLANG := true LOCAL_SDK_VERSION := 14 -LOCAL_NDK_STL_VARIANT := gnustl_static +LOCAL_NDK_STL_VARIANT := c++_static LOCAL_LDFLAGS += -ldl include $(BUILD_SHARED_LIBRARY)