Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02996dc5 authored by Ken Wakasa's avatar Ken Wakasa
Browse files

Clean up dependency for dicttool 

bug: 7635215
Change-Id: Ie50297ab592261390885c593341b6c46161b2e63
parent e14df775

tools/dicttool/Android.mk

+9 −5
Original line number Diff line number Diff line
@@ -23,16 +23,20 @@ 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_ANNOTATIONS_SRC_FILES := $(call all-java-files-under,$(LATINIME_ANNOTATIONS_SOURCE_DIRECTORY))

LOCAL_ANNOTATIONS_SRC_FILES := \

        $(call all-java-files-under, $(LATINIME_ANNOTATIONS_SOURCE_DIRECTORY))

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) \

        $(LOCAL_ANNOTATIONS_SRC_FILES) \

        $(LATINIME_CORE_SOURCE_DIRECTORY)/Constants.java



ifeq ($(DICTTOOL_UNITTEST), true)

    LOCAL_SRC_FILES += $(call all-java-files-under, tests)

    LOCAL_JAVA_LIBRARIES := junit

endif



LOCAL_JAR_MANIFEST := etc/manifest.txt

LOCAL_MODULE := dicttool_aosp

LOCAL_JAVA_LIBRARIES := junit



include $(BUILD_HOST_JAVA_LIBRARY)

include $(LOCAL_PATH)/etc/Android.mk

tools/dicttool/tests/etc/test-dicttool.sh

+11 −0
Original line number Diff line number Diff line
@@ -13,5 +13,16 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



if [[ $(type -t mmm) != function ]]; then

echo "Usage:" 1>&2

echo "    source $0" 1>&2

echo "  or" 1>&2

echo "    . $0" 1>&2

exit 1

fi



find out -name "dicttool_aosp*" -exec rm -rf {} \; > /dev/null 2>&1

mmm -j8 external/junit

DICTTOOL_UNITTEST=true mmm -j8 packages/inputmethods/LatinIME/tools/dicttool

java -classpath ${ANDROID_HOST_OUT}/framework/junit.jar:${ANDROID_HOST_OUT}/framework/dicttool_aosp.jar junit.textui.TestRunner com.android.inputmethod.latin.makedict.BinaryDictInputOutputTest

java -classpath ${ANDROID_HOST_OUT}/framework/junit.jar:${ANDROID_HOST_OUT}/framework/dicttool_aosp.jar junit.textui.TestRunner com.android.inputmethod.latin.dicttool.BinaryDictOffdeviceUtilsTests