nyancrimew/LatinIME
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

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

Browse source 
* commit 'b25404ec419e82e8f8b4f3b80d04708d39d9b7ad':
  Use LOCAL_MULTILIB to build host lib as 64-bit
This commit is contained in:
Ying Wang 2014-06-10 16:47:55 +00:00 committed by Android Git Automerger
commit 90b948ea0f
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/dicttool/Android.mk
View file

@ -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

3
tools/dicttool/NativeLib.mk
View file

@ -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