diff options
| -rw-r--r-- | java/src/com/android/inputmethod/latin/Constants.java | 4 | ||||
| -rw-r--r-- | tools/dicttool/Android.mk | 7 |
2 files changed, 6 insertions, 5 deletions
diff --git a/java/src/com/android/inputmethod/latin/Constants.java b/java/src/com/android/inputmethod/latin/Constants.java index 61817ce65..57e12a64f 100644 --- a/java/src/com/android/inputmethod/latin/Constants.java +++ b/java/src/com/android/inputmethod/latin/Constants.java @@ -16,8 +16,6 @@ package com.android.inputmethod.latin; -import android.view.inputmethod.EditorInfo; - public final class Constants { public static final class Color { /** @@ -54,7 +52,7 @@ public final class Constants { * The private IME option used to indicate that the given text field needs ASCII code points * input. * - * @deprecated Use {@link EditorInfo#IME_FLAG_FORCE_ASCII}. + * @deprecated Use EditorInfo#IME_FLAG_FORCE_ASCII. */ @SuppressWarnings("dep-ann") public static final String FORCE_ASCII = "forceAscii"; diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk index b0b47af00..5bd836a01 100644 --- a/tools/dicttool/Android.mk +++ b/tools/dicttool/Android.mk @@ -16,13 +16,16 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) -MAKEDICT_CORE_SOURCE_DIRECTORY := ../../java/src/com/android/inputmethod/latin/makedict +LATINIME_CORE_SOURCE_DIRECTORY := ../../java/src/com/android/inputmethod/latin +MAKEDICT_CORE_SOURCE_DIRECTORY := $(LATINIME_CORE_SOURCE_DIRECTORY)/makedict LOCAL_MAIN_SRC_FILES := $(call all-java-files-under,$(MAKEDICT_CORE_SOURCE_DIRECTORY)) LOCAL_TOOL_SRC_FILES := $(call all-java-files-under,src) LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \ $(filter-out $(addprefix %/, $(notdir $(LOCAL_TOOL_SRC_FILES))), $(LOCAL_MAIN_SRC_FILES)) \ - $(call all-java-files-under,tests) + $(call all-java-files-under,tests) \ + $(LATINIME_CORE_SOURCE_DIRECTORY)/Constants.java + LOCAL_JAR_MANIFEST := etc/manifest.txt LOCAL_MODULE := dicttool_aosp LOCAL_JAVA_LIBRARIES := junit |