commit d055cca7d28812a480eb49e8264f02d6b16fdfd5
author Jean Chalard <jchalard@google.com> Mon Aug 27 14:51:57 2012 +0900
committer Jean Chalard <jchalard@google.com> Wed Jun 19 20:08:54 2013 +0900
tree 228c104830b2da403182d925cd216ec0c4abfe17
parent 286877b3afc6309b70c5216f05b94729aeb844f3

Add an initial test command to dicttool.

Also fix some warnings
This is a preliminary change to help track b/8526576

Bug: 8526576
Change-Id: If2ed74bb92f9b5fb7bbaf9c4851d9d0b5514b405

tools/dicttool/Android.mk

diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index 666887a..d3bff86 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -28,12 +28,10 @@
 LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \
         $(filter-out $(addprefix %/, $(notdir $(LOCAL_TOOL_SRC_FILES))), $(LOCAL_MAIN_SRC_FILES)) \
         $(LOCAL_ANNOTATIONS_SRC_FILES) \
-        $(LATINIME_CORE_SOURCE_DIRECTORY)/Constants.java
+        $(LATINIME_CORE_SOURCE_DIRECTORY)/Constants.java \
+        $(call all-java-files-under, tests)
 
-ifeq ($(DICTTOOL_UNITTEST), true)
-    LOCAL_SRC_FILES += $(call all-java-files-under, tests)
-    LOCAL_JAVA_LIBRARIES := junit
-endif
+LOCAL_JAVA_LIBRARIES := junit
 
 LOCAL_JAR_MANIFEST := etc/manifest.txt
 LOCAL_MODULE := dicttool_aosp