Skip to content
Snippets Groups Projects
Commit 90b948ea authored by Ying Wang's avatar Ying Wang Committed by Android Git Automerger
Browse files

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

* commit 'b25404ec':
  Use LOCAL_MULTILIB to build host lib as 64-bit
parents 8ce65243 b25404ec
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tools/dicttool/Android.mk
+ 1
− 1
View file @ 90b948ea
...@@ -51,7 +51,7 @@ LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \ ...@@ -51,7 +51,7 @@ LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \
$(USED_TARGETTED_UTILS) $(USED_TARGETTED_UTILS)
LOCAL_JAVA_LIBRARIES := junit 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_JAR_MANIFEST := etc/manifest.txt
LOCAL_MODULE := dicttool_aosp LOCAL_MODULE := dicttool_aosp
......
tools/dicttool/NativeLib.mk
+ 1
− 2
View file @ 90b948ea
...@@ -21,8 +21,7 @@ include $(CLEAR_VARS) ...@@ -21,8 +21,7 @@ include $(CLEAR_VARS)
LATINIME_DIR_RELATIVE_TO_DICTTOOL := ../.. LATINIME_DIR_RELATIVE_TO_DICTTOOL := ../..
ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),) ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
LOCAL_CFLAGS += -m64 LOCAL_MULTILIB := 64
LOCAL_LDFLAGS += -m64
endif #HOST_JDK_IS_64BIT_VERSION endif #HOST_JDK_IS_64BIT_VERSION
LOCAL_CFLAGS += -DHOST_TOOL -fPIC LOCAL_CFLAGS += -DHOST_TOOL -fPIC
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment