21 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
diff --git a/tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-az/donottranslate-more-keys.xml
index 52fe5658c..52fe5658c 100644
--- a/tools/make-keyboard-text/res/values-az-rAZ/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-az/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-be-rBY/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-be/donottranslate-more-keys.xml
index 52ada29d9..52ada29d9 100644
--- a/tools/make-keyboard-text/res/values-be-rBY/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-be/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-et-rEE/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-et/donottranslate-more-keys.xml
index 79266e823..79266e823 100644
--- a/tools/make-keyboard-text/res/values-et-rEE/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-et/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-eu-rES/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-eu/donottranslate-more-keys.xml
index 95f632a52..95f632a52 100644
--- a/tools/make-keyboard-text/res/values-eu-rES/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-eu/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-gl-rES/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-gl/donottranslate-more-keys.xml
index 95f632a52..95f632a52 100644
--- a/tools/make-keyboard-text/res/values-gl-rES/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-gl/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-hy/donottranslate-more-keys.xml
index 08d88e54d..08d88e54d 100644
--- a/tools/make-keyboard-text/res/values-hy-rAM/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-hy/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-ka-rGE/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ka/donottranslate-more-keys.xml
index f458c02e3..f458c02e3 100644
--- a/tools/make-keyboard-text/res/values-ka-rGE/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-ka/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-km-rKH/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-km/donottranslate-more-keys.xml
index edd3753b7..edd3753b7 100644
--- a/tools/make-keyboard-text/res/values-km-rKH/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-km/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-kn-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-kn/donottranslate-more-keys.xml
index 54b267462..54b267462 100644
--- a/tools/make-keyboard-text/res/values-kn-rIN/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-kn/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-lo-rLA/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-lo/donottranslate-more-keys.xml
index 1059930e4..1059930e4 100644
--- a/tools/make-keyboard-text/res/values-lo-rLA/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-lo/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-ml-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ml/donottranslate-more-keys.xml
index 7a2aeed36..7a2aeed36 100644
--- a/tools/make-keyboard-text/res/values-ml-rIN/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-ml/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-mn-rMN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-mn/donottranslate-more-keys.xml
index 3fafb397b..3fafb397b 100644
--- a/tools/make-keyboard-text/res/values-mn-rMN/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-mn/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-mr-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-mr/donottranslate-more-keys.xml
index 19db16da1..19db16da1 100644
--- a/tools/make-keyboard-text/res/values-mr-rIN/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-mr/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-my/donottranslate-more-keys.xml
index f408f588a..f408f588a 100644
--- a/tools/make-keyboard-text/res/values-my-rMM/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-my/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-ne/donottranslate-more-keys.xml
index 56b594f3a..56b594f3a 100644
--- a/tools/make-keyboard-text/res/values-ne-rNP/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-ne/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-si-rLK/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-si/donottranslate-more-keys.xml
index 871d82ab0..871d82ab0 100644
--- a/tools/make-keyboard-text/res/values-si-rLK/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-si/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-te-rIN/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-te/donottranslate-more-keys.xml
index 6518dea8f..6518dea8f 100644
--- a/tools/make-keyboard-text/res/values-te-rIN/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-te/donottranslate-more-keys.xml
diff --git a/tools/make-keyboard-text/res/values-uz-rUZ/donottranslate-more-keys.xml b/tools/make-keyboard-text/res/values-uz/donottranslate-more-keys.xml
index 24dd091b5..24dd091b5 100644
--- a/tools/make-keyboard-text/res/values-uz-rUZ/donottranslate-more-keys.xml
+++ b/tools/make-keyboard-text/res/values-uz/donottranslate-more-keys.xml