aboutsummaryrefslogtreecommitdiffstats
path: root/tools/dicttool/NativeLib.mk
diff options
context:
space:
mode:
authorKen Wakasa <kwakasa@google.com>2014-04-04 19:55:59 +0900
committerKen Wakasa <kwakasa@google.com>2014-04-04 20:10:04 +0900
commit3ccbf7ef088ae5ed0540a1051c11dcaea0c9263e (patch)
treec104c3e1a048ba81a9d2e9173b378b22955835bf /tools/dicttool/NativeLib.mk
parentfd6b1ac82273f51bc1ab27cc054ae6bf0ee8a4bd (diff)
downloadlatinime-3ccbf7ef088ae5ed0540a1051c11dcaea0c9263e.tar.gz
latinime-3ccbf7ef088ae5ed0540a1051c11dcaea0c9263e.tar.xz
latinime-3ccbf7ef088ae5ed0540a1051c11dcaea0c9263e.zip
32-bit dicttool
As we can't easily turn on -m64 for only one module, the JNI library for a host tool should be 32-bit, at least for now. Change-Id: I1f001ccca1ad968a2241c0494bb70391fb11a59f
Diffstat (limited to 'tools/dicttool/NativeLib.mk')
-rw-r--r--tools/dicttool/NativeLib.mk9
1 files changed, 1 insertions, 8 deletions
diff --git a/tools/dicttool/NativeLib.mk b/tools/dicttool/NativeLib.mk
index 0d3507be3..30444493c 100644
--- a/tools/dicttool/NativeLib.mk
+++ b/tools/dicttool/NativeLib.mk
@@ -29,13 +29,7 @@ ifeq ($(FLAG_DBG), true)
LOCAL_CFLAGS += -DFLAG_DBG -funwind-tables -fno-inline
endif #FLAG_DBG
-ifneq ($(strip $(HOST_JDK_IS_64BIT_VERSION)),)
-LOCAL_CFLAGS += -m64
-LOCAL_LDFLAGS += -m64
-endif #HOST_JDK_IS_64BIT_VERSION
-
-LOCAL_CFLAGS += -DHOST_TOOL -fPIC -Wno-deprecated
-LOCAL_NO_DEFAULT_COMPILER_FLAGS := true
+LOCAL_CFLAGS += -DHOST_TOOL -fPIC -Wno-deprecated -Wno-unused-parameter -Wno-unused-function
LOCAL_CLANG := true
# For C++11
@@ -44,7 +38,6 @@ LOCAL_CFLAGS += -std=c++11
LATINIME_NATIVE_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni
LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src
LOCAL_C_INCLUDES := $(LOCAL_PATH)/$(LATINIME_NATIVE_SRC_DIR)
-# Used in jni_common.cpp to avoid registering useless methods.
include $(LOCAL_PATH)/$(LATINIME_NATIVE_JNI_DIR)/NativeFileList.mk