commit b25404ec419e82e8f8b4f3b80d04708d39d9b7ad
author Ying Wang <wangying@google.com> Tue Jun 10 16:26:57 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jun 10 16:26:58 2014 +0000
tree 16f6359ac554bcb5aaec68b490baca19d5591ec2
parent 2debf168920bb852b1583446fc336743f98b3c04
parent fb57fe263cb54f0132fa5299c60aca99c240d821

Merge "Use LOCAL_MULTILIB to build host lib as 64-bit"

tools/dicttool/Android.mk

diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index 3d09c05..aaf31c6 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -51,7 +51,7 @@
         $(USED_TARGETTED_UTILS)
 
 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
 

tools/dicttool/NativeLib.mk

diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk
index a3d3c02..812e76c 100644
--- a/tools/dicttool/NativeLib.mk
+++ b/tools/dicttool/NativeLib.mk
@@ -21,8 +21,7 @@
 LATINIME_DIR_RELATIVE_TO_DICTTOOL := ../..
 
 ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
-LOCAL_CFLAGS += -m64
-LOCAL_LDFLAGS += -m64
+LOCAL_MULTILIB := 64
 endif #HOST_JDK_IS_64BIT_VERSION
 
 LOCAL_CFLAGS += -DHOST_TOOL -fPIC