diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2013-04-10 19:35:42 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-04-10 19:35:42 -0700 |
| commit | b3cf23de7f30eb4c9c8c757d8b02a12fdad026aa (patch) | |
| tree | 44f2b49e5b68c76c64b0c1f8647aed74dcd4967a | |
| parent | ff730a665cc90aec1c795c8555e8563ff1bfbc37 (diff) | |
| parent | a271f165b92069a7684a1dfc2c43533dc79fccdd (diff) | |
| download | latinime-b3cf23de7f30eb4c9c8c757d8b02a12fdad026aa.tar.gz latinime-b3cf23de7f30eb4c9c8c757d8b02a12fdad026aa.tar.xz latinime-b3cf23de7f30eb4c9c8c757d8b02a12fdad026aa.zip | |
am a271f165: am 31f42ba0: Tiny clean up in Makefile
* commit 'a271f165b92069a7684a1dfc2c43533dc79fccdd':
Tiny clean up in Makefile
| -rw-r--r-- | native/jni/Android.mk | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/native/jni/Android.mk b/native/jni/Android.mk index 463cd71da..cbe9515fe 100644 --- a/native/jni/Android.mk +++ b/native/jni/Android.mk @@ -24,9 +24,8 @@ FLAG_DO_PROFILE ?= false include $(CLEAR_VARS) LATIN_IME_SRC_DIR := src -LATIN_IME_SRC_FULLPATH_DIR := $(LOCAL_PATH)/$(LATIN_IME_SRC_DIR) -LOCAL_C_INCLUDES += $(LATIN_IME_SRC_FULLPATH_DIR) +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 -Wno-system-headers @@ -60,11 +59,11 @@ LATIN_IME_CORE_SRC_FILES := \ proximity_info_state_utils.cpp \ unigram_dictionary.cpp \ words_priority_queue.cpp \ + suggest/core/suggest.cpp \ $(addprefix suggest/core/dicnode/, \ dic_node.cpp \ dic_node_utils.cpp \ dic_nodes_cache.cpp) \ - suggest/core/suggest.cpp \ suggest/core/policy/weighting.cpp \ suggest/core/session/dic_traverse_session.cpp \ suggest/policyimpl/gesture/gesture_suggest_policy_factory.cpp \ @@ -128,6 +127,4 @@ include $(BUILD_SHARED_LIBRARY) #################### Clean up the tmp vars LATIN_IME_CORE_SRC_FILES := LATIN_IME_JNI_SRC_FILES := -LATIN_IME_GESTURE_IMPL_SRC_FILES := LATIN_IME_SRC_DIR := -LATIN_IME_SRC_FULLPATH_DIR := |