diff options
Diffstat (limited to 'native/jni/Android.mk')
| -rw-r--r-- | native/jni/Android.mk | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 567648f7a..c616be56e 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -28,7 +28,14 @@ LATIN_IME_SRC_FULLPATH_DIR := $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) LOCAL_C_INCLUDES += $(LATIN_IME_SRC_FULLPATH_DIR) $(LATIN_IME_SRC_FULLPATH_DIR)/gesture -LOCAL_CFLAGS += -Werror -Wall +LOCAL_CFLAGS += -Werror -Wall -Wextra -Weffc++ -Wformat=2 -Wcast-qual -Wcast-align \ + -Wwrite-strings -Wfloat-equal -Wpointer-arith -Winit-self -Wredundant-decls -Wno-system-headers + +ifeq ($(TARGET_ARCH), arm) +ifneq ($(TARGET_GCC_VERSION), 4.7) +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 @@ -41,7 +48,6 @@ LATIN_IME_JNI_SRC_FILES := \ LATIN_IME_CORE_SRC_FILES := \ additional_proximity_chars.cpp \ - basechars.cpp \ bigram_dictionary.cpp \ char_utils.cpp \ correction.cpp \ @@ -50,6 +56,7 @@ LATIN_IME_CORE_SRC_FILES := \ proximity_info.cpp \ proximity_info_state.cpp \ unigram_dictionary.cpp \ + words_priority_queue.cpp \ gesture/gesture_decoder_wrapper.cpp \ gesture/incremental_decoder_wrapper.cpp @@ -82,11 +89,11 @@ LOCAL_WHOLE_STATIC_LIBRARIES := libjni_latinime_common_static ifeq ($(FLAG_DO_PROFILE), true) $(warning Making profiling version of native library) - LOCAL_SHARED_LIBRARIES += liblog + LOCAL_LDFLAGS += -llog else # FLAG_DO_PROFILE ifeq ($(FLAG_DBG), true) $(warning Making debug version of native library) - LOCAL_SHARED_LIBRARIES += liblog + LOCAL_LDFLAGS += -llog endif # FLAG_DBG endif # FLAG_DO_PROFILE |