diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dicttool/Android.mk | 2 | ||||
| -rw-r--r-- | tools/dicttool/NativeLib.mk | 3 | ||||
| -rwxr-xr-x | tools/dicttool/tests/etc/test-dicttool.sh | 4 |
3 files changed, 3 insertions, 6 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/NativeLib.mk b/tools/dicttool/NativeLib.mk index ffb32edbe..622a9f171 100644 --- a/tools/dicttool/NativeLib.mk +++ b/tools/dicttool/NativeLib.mk @@ -34,9 +34,6 @@ ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),) LOCAL_MULTILIB := 64 endif #HOST_JDK_IS_64BIT_VERSION -# For C++11 -LOCAL_CFLAGS += -std=c++11 - LATINIME_NATIVE_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(LATINIME_NATIVE_SRC_DIR) 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 |