diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-03-18 01:39:50 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-03-18 01:39:50 -0700 |
| commit | cf4ac84c5cd83cf84657c5dcc17d9a220401649e (patch) | |
| tree | ae6473851d4e310ddeb886dacaeb6f993c8b3a72 | |
| parent | 79ff39fccd6f186ff3acf0b1568de78b24ca846c (diff) | |
| parent | 948c4a696f74a9686fa13ef010a9799cf7681e73 (diff) | |
| download | latinime-cf4ac84c5cd83cf84657c5dcc17d9a220401649e.tar.gz latinime-cf4ac84c5cd83cf84657c5dcc17d9a220401649e.tar.xz latinime-cf4ac84c5cd83cf84657c5dcc17d9a220401649e.zip | |
am 948c4a69: Merge "Switch to Clang and libc++"
* commit '948c4a696f74a9686fa13ef010a9799cf7681e73':
Switch to Clang and libc++
| -rw-r--r-- | native/jni/Android.mk | 8 |
1 files 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) |