Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b25404ec authored Jun 10, 2014 by Ying Wang Committed by Gerrit Code Review Jun 10, 2014

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

parents 2debf168 fb57fe26

tools/dicttool/Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

tools/dicttool/NativeLib.mk

+1 −2

Original line number	Diff line number	Diff line
		@@ -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