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

Commit 2cb8e194 authored by Paul Duffin's avatar Paul Duffin Committed by android-build-merger
Browse files

Merge "Use junit-host instead of junit" am: 8293d4f2 am: e4ea7e81 

am: 17a53d5e

Change-Id: I0592babdb41bcb9ee4110c3b6ba67787699d0959
parents 2e570aae 17a53d5e

tools/dicttool/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -77,7 +77,7 @@ LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \ 
        $(call all-java-files-under, \

                tests $(DICTTOOL_COMPAT_TESTS_DIR) $(DICTTOOL_ONDEVICE_TESTS_DIR))



LOCAL_JAVA_LIBRARIES := junit

LOCAL_JAVA_LIBRARIES := junit-host

LOCAL_STATIC_JAVA_LIBRARIES := jsr305lib latinime-common-host

LOCAL_REQUIRED_MODULES := $(LATINIME_HOST_NATIVE_LIBNAME)

LOCAL_JAR_MANIFEST := etc/manifest.txt

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

+2 −2
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ 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.BinaryDictEncoderFlattenTreeTests

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

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