resolved conflicts for merge of 90b948ea to master
Change-Id: Ic86260b4e49ebda2ee718eadf0109ad9626a68e6
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index ba57fbe..ce51df1 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -84,7 +84,7 @@
$(call all-java-files-under, $(DICTTOOL_ONDEVICE_TESTS_DIRECTORY))
LOCAL_JAVA_LIBRARIES := junit
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LATINIME_HOST_NATIVE_LIBNAME)
+LOCAL_REQUIRED_MODULES := $(LATINIME_HOST_NATIVE_LIBNAME)
LOCAL_JAR_MANIFEST := etc/manifest.txt
LOCAL_MODULE := dicttool_aosp
diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk
index 7403448..028025d 100644
--- a/tools/dicttool/NativeLib.mk
+++ b/tools/dicttool/NativeLib.mk
@@ -30,6 +30,9 @@
endif #FLAG_DBG
LOCAL_CFLAGS += -DHOST_TOOL -fPIC -Wno-deprecated -Wno-unused-parameter -Wno-unused-function
+ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
+LOCAL_MULTILIB := 64
+endif #HOST_JDK_IS_64BIT_VERSION
LOCAL_CLANG := true
# For C++11