diff options
| author |   Paul Duffin <paulduffin@google.com> | 2016-11-30 13:50:28 +0000 |
|---|---|---|
| committer |   android-build-merger <android-build-merger@google.com> | 2016-11-30 13:50:28 +0000 |
| commit | 7b7b28a4080127bb652be8b36ebc3e17c9f000c9 (patch) | |
| tree | 0fb2264bf5dcaeddd6ec575b61449bda6b2c43e1 | |
| parent | 1a4053f54059d18e76ded269a6329a3f6def3d0f (diff) | |
| parent | 2cb8e1941328948524d32501a060da7e920fdaed (diff) | |
| download | latinime-7b7b28a4080127bb652be8b36ebc3e17c9f000c9.tar.gz latinime-7b7b28a4080127bb652be8b36ebc3e17c9f000c9.tar.xz latinime-7b7b28a4080127bb652be8b36ebc3e17c9f000c9.zip | |
Merge "Use junit-host instead of junit" am: 8293d4f266 am: e4ea7e8191 am: 17a53d5e94
am: 2cb8e19413
Change-Id: I2b5941acc6fc04941687086d7eb9b992052bd139
| -rw-r--r-- | tools/dicttool/Android.mk | 2 | ||||
| -rwxr-xr-x | tools/dicttool/tests/etc/test-dicttool.sh | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk index 1a9f029ae..6852b82b4 100644 --- a/tools/dicttool/Android.mk +++ b/tools/dicttool/Android.mk @@ -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 diff --git a/tools/dicttool/tests/etc/test-dicttool.sh b/tools/dicttool/tests/etc/test-dicttool.sh index f96db6816..2f53049c3 100755 --- a/tools/dicttool/tests/etc/test-dicttool.sh +++ b/tools/dicttool/tests/etc/test-dicttool.sh @@ -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 |