diff options
| author |   Ying Wang <wangying@google.com> | 2014-06-11 12:28:56 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-06-11 12:28:56 -0700 |
| commit | c49c9c52bec44303923001af554c160a4117d071 (patch) | |
| tree | f6040806bf67719e0d18ba38939dfc6716c02e4a /tools | |
| parent | 4715baf93ba69706b23bca6ac50d901006fb4494 (diff) | |
| parent | 90b948ea0f90b7fa9580215990efece69b63928b (diff) | |
| download | latinime-c49c9c52bec44303923001af554c160a4117d071.tar.gz latinime-c49c9c52bec44303923001af554c160a4117d071.tar.xz latinime-c49c9c52bec44303923001af554c160a4117d071.zip | |
resolved conflicts for merge of 90b948ea to master
Change-Id: Ic86260b4e49ebda2ee718eadf0109ad9626a68e6
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dicttool/Android.mk | 2 | ||||
| -rw-r--r-- | tools/dicttool/NativeLib.mk | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tools/dicttool/Android.mk b/tools/dicttool/Android.mk index ba57fbe02..ce51df1eb 100644 --- a/tools/dicttool/Android.mk +++ b/tools/dicttool/Android.mk @@ -84,7 +84,7 @@ LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \ $(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 74034482b..028025d91 100644 --- a/tools/dicttool/NativeLib.mk +++ b/tools/dicttool/NativeLib.mk @@ -30,6 +30,9 @@ ifeq ($(FLAG_DBG), true) 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 |