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

Commit c49c9c52 authored Jun 11, 2014 by Ying Wang

resolved conflicts for merge of 90b948ea to master

Change-Id: Ic86260b4e49ebda2ee718eadf0109ad9626a68e6

parents 4715baf9 90b948ea

tools/dicttool/Android.mk

+1 −1

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

tools/dicttool/NativeLib.mk

+3 −0

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