diff options
| author |   Jean Chalard <jchalard@google.com> | 2011-07-13 19:20:32 -0700 |
|---|---|---|
| committer |   Android (Google) Code Review <android-gerrit@google.com> | 2011-07-13 19:20:32 -0700 |
| commit | b2ba41397f14d22e2088fac3306c02a0d587efe6 (patch) | |
| tree | fcbc075a8f6b4479d2ead8e6c23a44b526db4249 | |
| parent | 9f9de3570d63027b5f2ac81d099df77adb4b1928 (diff) | |
| parent | cba9e23bb19db123fa5b491b69b0b32ca5eca254 (diff) | |
| download | latinime-b2ba41397f14d22e2088fac3306c02a0d587efe6.tar.gz latinime-b2ba41397f14d22e2088fac3306c02a0d587efe6.tar.xz latinime-b2ba41397f14d22e2088fac3306c02a0d587efe6.zip | |
Merge "Activate the implementation for the new dictionary format."
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | native/Android.mk | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 44ff0a29d..9b498f449 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -48,6 +48,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/LatinIME*) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/LatinIME.apk) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/native/Android.mk b/native/Android.mk index f8cc45d0a..bc246a990 100644 --- a/native/Android.mk +++ b/native/Android.mk @@ -8,6 +8,9 @@ LOCAL_CFLAGS += -Werror -Wall # To suppress compiler warnings for unused variables/functions used for debug features etc. LOCAL_CFLAGS += -Wno-unused-parameter -Wno-unused-function +# Use the new dictionary format +LOCAL_CFLAGS += -DNEW_DICTIONARY_FORMAT + LOCAL_SRC_FILES := \ jni/com_android_inputmethod_keyboard_ProximityInfo.cpp \ jni/com_android_inputmethod_latin_BinaryDictionary.cpp \ |