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

Commit 982f0fa2 authored by Paul Duffin's avatar Paul Duffin
Browse files

Use junit-host instead of junit 

Use framework/junit-host.jar instead of framework/junit.jar

Ran the script before and after making the change and it failed
in the same way with a build error but it was not due to a
problem with JUnit.

Bug: 30188076
Test: make checkbuild and ran the test-dicttool.sh script
Change-Id: I4cdd518f38184ff3ade5a06d968d6902770ece6b
parent d2af7017

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