From fb57fe263cb54f0132fa5299c60aca99c240d821 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Mon, 9 Jun 2014 12:16:30 -0700
Subject: [PATCH] Use LOCAL_MULTILIB to build host lib as 64-bit

Also we should use LOCAL_REQUIRED_MODULES instead of
LOCAL_ADDITIONAL_DEPENDENCIES.

Bug: 13751317
Change-Id: I742ff14b3de168e14e646749cf4f6bc9c9e7bc62
---
 tools/dicttool/Android.mk   | 2 +-
 tools/dicttool/NativeLib.mk | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk
index 3d09c0508..aaf31c6f9 100644
--- a/tools/dicttool/Android.mk
+++ b/tools/dicttool/Android.mk
@@ -51,7 +51,7 @@ LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \
         $(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
 
diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk
index a3d3c0295..812e76ced 100644
--- a/tools/dicttool/NativeLib.mk
+++ b/tools/dicttool/NativeLib.mk
@@ -21,8 +21,7 @@ include $(CLEAR_VARS)
 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