diff options
| author |   Ying Wang <wangying@google.com> | 2014-06-10 16:47:55 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-06-10 16:47:55 +0000 |
| commit | 90b948ea0f90b7fa9580215990efece69b63928b (patch) | |
| tree | 16f6359ac554bcb5aaec68b490baca19d5591ec2 | |
| parent | 8ce65243e7891d0f23e3783f6bb89db418b9db06 (diff) | |
| parent | b25404ec419e82e8f8b4f3b80d04708d39d9b7ad (diff) | |
| download | latinime-90b948ea0f90b7fa9580215990efece69b63928b.tar.gz latinime-90b948ea0f90b7fa9580215990efece69b63928b.tar.xz latinime-90b948ea0f90b7fa9580215990efece69b63928b.zip | |
am b25404ec: Merge "Use LOCAL_MULTILIB to build host lib as 64-bit"
* commit 'b25404ec419e82e8f8b4f3b80d04708d39d9b7ad':
Use LOCAL_MULTILIB to build host lib as 64-bit
| -rw-r--r-- | tools/dicttool/Android.mk | 2 | ||||
| -rw-r--r-- | 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 |