summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2014-10-22 21:29:46 +0900
committerKen Wakasa <kwakasa@google.com>2014-10-23 13:00:46 +0900
commitb11fc7d423667f1cd949b50ddea3761e72d16a2c (patch)
tree31cd31cf378f8e409daf82dd92a5219104089f54 /tools
parentd3a4c5132422b189c8dbb94dbbe84a9b9761b0a8 (diff)
downloadandroid_packages_inputmethods_LatinIME-b11fc7d423667f1cd949b50ddea3761e72d16a2c.tar.gz
android_packages_inputmethods_LatinIME-b11fc7d423667f1cd949b50ddea3761e72d16a2c.tar.bz2
android_packages_inputmethods_LatinIME-b11fc7d423667f1cd949b50ddea3761e72d16a2c.zip
Move annotations classes to latiime-common
Move Constants.java too. Change-Id: I55e8cf06f61c0a37746a7328834a52a5306cf0f2
Diffstat (limited to 'tools')
-rw-r--r--tools/dicttool/Android.mk10
1 files changed, 3 insertions, 7 deletions
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