diff options
| author |   Ken Wakasa <kwakasa@google.com> | 2014-10-23 07:54:37 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-10-23 07:54:37 +0000 |
| commit | 2fbb11ee1b57c8ac90feafc0ed4ae158f4bf35f3 (patch) | |
| tree | cf7eb6d946c660885f5904a792d0d58f45eea809 | |
| parent | 77e6afd1f243eb05936a00f54f6839ecacddd35c (diff) | |
| parent | b11fc7d423667f1cd949b50ddea3761e72d16a2c (diff) | |
| download | latinime-2fbb11ee1b57c8ac90feafc0ed4ae158f4bf35f3.tar.gz latinime-2fbb11ee1b57c8ac90feafc0ed4ae158f4bf35f3.tar.xz latinime-2fbb11ee1b57c8ac90feafc0ed4ae158f4bf35f3.zip | |
am b11fc7d4: Move annotations classes to latiime-common
* commit 'b11fc7d423667f1cd949b50ddea3761e72d16a2c':
Move annotations classes to latiime-common
| -rw-r--r-- | common/src/com/android/inputmethod/annotations/ExternallyReferenced.java (renamed from java/src/com/android/inputmethod/annotations/ExternallyReferenced.java) | 0 | ||||
| -rw-r--r-- | common/src/com/android/inputmethod/annotations/UsedForTesting.java (renamed from java/src/com/android/inputmethod/annotations/UsedForTesting.java) | 0 | ||||
| -rw-r--r-- | common/src/com/android/inputmethod/latin/Constants.java (renamed from java/src/com/android/inputmethod/latin/Constants.java) | 0 | ||||
| -rw-r--r-- | tools/dicttool/Android.mk | 10 |
4 files changed, 3 insertions, 7 deletions
diff --git a/java/src/com/android/inputmethod/annotations/ExternallyReferenced.java b/common/src/com/android/inputmethod/annotations/ExternallyReferenced.java index ea5f12ce2..ea5f12ce2 100644 --- a/java/src/com/android/inputmethod/annotations/ExternallyReferenced.java +++ b/common/src/com/android/inputmethod/annotations/ExternallyReferenced.java diff --git a/java/src/com/android/inputmethod/annotations/UsedForTesting.java b/common/src/com/android/inputmethod/annotations/UsedForTesting.java index 2ada091e4..2ada091e4 100644 --- a/java/src/com/android/inputmethod/annotations/UsedForTesting.java +++ b/common/src/com/android/inputmethod/annotations/UsedForTesting.java diff --git a/java/src/com/android/inputmethod/latin/Constants.java b/common/src/com/android/inputmethod/latin/Constants.java index 0fd5659ec..0fd5659ec 100644 --- a/java/src/com/android/inputmethod/latin/Constants.java +++ b/common/src/com/android/inputmethod/latin/Constants.java diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk index ff6c1e433..09af9a020 100644 --- a/tools/dicttool/Android.mk +++ b/tools/dicttool/Android.mk @@ -35,7 +35,6 @@ LATINIME_LOCAL_DIR := ../.. LATINIME_BASE_SRC_DIR := $(LATINIME_LOCAL_DIR)/java/src/com/android/inputmethod LATINIME_BASE_OVERRIDABLE_SRC_DIR := \ $(LATINIME_LOCAL_DIR)/java-overridable/src/com/android/inputmethod -LATINIME_ANNOTATIONS_SRC_DIR := $(LATINIME_BASE_SRC_DIR)/annotations MAKEDICT_CORE_SRC_DIR := $(LATINIME_BASE_SRC_DIR)/latin/makedict LATINIME_TESTS_SRC_DIR := $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin @@ -82,15 +81,12 @@ DICTTOOL_COMPAT_TESTS_DIR := compat LOCAL_MAIN_SRC_FILES := $(call all-java-files-under, $(MAKEDICT_CORE_SRC_DIR)) LOCAL_TOOL_SRC_FILES := $(call all-java-files-under, src) -LOCAL_ANNOTATIONS_SRC_FILES := $(call all-java-files-under, $(LATINIME_ANNOTATIONS_SRC_DIR)) LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \ $(filter-out $(addprefix %/, $(notdir $(LOCAL_TOOL_SRC_FILES))), $(LOCAL_MAIN_SRC_FILES)) \ - $(call all-java-files-under, $(DICTTOOL_COMPAT_TESTS_DIR)) \ - $(LOCAL_ANNOTATIONS_SRC_FILES) $(USED_TARGETED_SRC_FILES) \ - $(LATINIME_BASE_SRC_DIR)/latin/Constants.java \ - $(call all-java-files-under, tests) \ - $(call all-java-files-under, $(DICTTOOL_ONDEVICE_TESTS_DIR)) + $(USED_TARGETED_SRC_FILES) \ + $(call all-java-files-under, \ + tests $(DICTTOOL_COMPAT_TESTS_DIR) $(DICTTOOL_ONDEVICE_TESTS_DIR)) LOCAL_JAVA_LIBRARIES := junit LOCAL_STATIC_JAVA_LIBRARIES := jsr305lib latinime-common-host |