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

am ff2456c8: Merge "Use Clang for dicttool" 

* commit 'ff2456c8009cb4b5cdcc69a4e81d872981860a15':
  Use Clang for dicttool
main
Ken Wakasa 2014-03-27 10:26:33 +00:00 committed by Android Git Automerger
parent d8257a889a ff2456c800
commit 96faf323d8
3 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tools/dicttool/Android.mk
View File

@ -35,7 +35,7 @@ LATINIME_TESTS_SOURCE_DIRECTORY := $(LATINIME_LOCAL_DIR)/tests/src/com/android/i
# Dependencies for Dicttool. Most of these files are needed by BinaryDictionary.java. Note that # Dependencies for Dicttool. Most of these files are needed by BinaryDictionary.java. Note that
# a significant part of the dependencies are mocked in the compat/ directory, with empty or # a significant part of the dependencies are mocked in the compat/ directory, with empty or
# nearly-empty implementations, for parts that we don't use in Dicttool. # nearly-empty implementations, for parts that we don't use in Dicttool.
LATINIME_SRCS_FOR_DICTTOOL := \ LATINIME_SRC_FILES_FOR_DICTTOOL := \
event/Combiner.java \ event/Combiner.java \
event/Event.java \ event/Event.java \
latin/BinaryDictionary.java \ latin/BinaryDictionary.java \
@ -57,12 +57,12 @@ LATINIME_SRCS_FOR_DICTTOOL := \
latin/utils/ResizableIntArray.java \ latin/utils/ResizableIntArray.java \
latin/utils/StringUtils.java latin/utils/StringUtils.java
LATINIME_TEST_SRCS_FOR_DICTTOOL := \ LATINIME_TEST_SRC_FILES_FOR_DICTTOOL := \
utils/ByteArrayDictBuffer.java utils/ByteArrayDictBuffer.java
USED_TARGETED_SRCS := \ USED_TARGETED_SRCS := \
$(addprefix $(LATINIME_BASE_SOURCE_DIRECTORY)/, $(LATINIME_SRCS_FOR_DICTTOOL)) \ $(addprefix $(LATINIME_BASE_SOURCE_DIRECTORY)/, $(LATINIME_SRC_FILES_FOR_DICTTOOL)) \
$(addprefix $(LATINIME_TESTS_SOURCE_DIRECTORY)/, $(LATINIME_TEST_SRCS_FOR_DICTTOOL)) $(addprefix $(LATINIME_TESTS_SOURCE_DIRECTORY)/, $(LATINIME_TEST_SRC_FILES_FOR_DICTTOOL))
DICTTOOL_ONDEVICE_TESTS_DIRECTORY := \ DICTTOOL_ONDEVICE_TESTS_DIRECTORY := \
$(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin/makedict/ $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin/makedict/
@ -75,12 +75,11 @@ LOCAL_ANNOTATIONS_SRC_FILES := \
LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \ LOCAL_SRC_FILES := $(LOCAL_TOOL_SRC_FILES) \
$(filter-out $(addprefix %/, $(notdir $(LOCAL_TOOL_SRC_FILES))), $(LOCAL_MAIN_SRC_FILES)) \ $(filter-out $(addprefix %/, $(notdir $(LOCAL_TOOL_SRC_FILES))), $(LOCAL_MAIN_SRC_FILES)) \
$(LOCAL_ANNOTATIONS_SRC_FILES) \ $(call all-java-files-under, $(DICTTOOL_COMPAT_TESTS_DIRECTORY)) \
$(LOCAL_ANNOTATIONS_SRC_FILES) $(USED_TARGETED_SRCS) \
$(LATINIME_BASE_SOURCE_DIRECTORY)/latin/Constants.java \ $(LATINIME_BASE_SOURCE_DIRECTORY)/latin/Constants.java \
$(call all-java-files-under, tests) \ $(call all-java-files-under, tests) \
$(call all-java-files-under, $(DICTTOOL_ONDEVICE_TESTS_DIRECTORY)) \ $(call all-java-files-under, $(DICTTOOL_ONDEVICE_TESTS_DIRECTORY))
$(call all-java-files-under, $(DICTTOOL_COMPAT_TESTS_DIRECTORY)) \
$(USED_TARGETED_SRCS)
LOCAL_JAVA_LIBRARIES := junit LOCAL_JAVA_LIBRARIES := junit
LOCAL_ADDITIONAL_DEPENDENCIES := $(LATINIME_HOST_NATIVE_LIBNAME) LOCAL_ADDITIONAL_DEPENDENCIES := $(LATINIME_HOST_NATIVE_LIBNAME)

4
tools/dicttool/NativeLib.mk
View File

@ -37,9 +37,9 @@ endif #HOST_JDK_IS_64BIT_VERSION
LOCAL_CFLAGS += -DHOST_TOOL -fPIC -Wno-deprecated LOCAL_CFLAGS += -DHOST_TOOL -fPIC -Wno-deprecated
LOCAL_NO_DEFAULT_COMPILER_FLAGS := true LOCAL_NO_DEFAULT_COMPILER_FLAGS := true
LOCAL_CLANG := true
# For C++11 # For C++11
# TODO: Change this to -std=c++11 LOCAL_CFLAGS += -std=c++11
LOCAL_CFLAGS += -std=gnu++0x
LATINIME_NATIVE_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni LATINIME_NATIVE_JNI_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni
LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src LATINIME_NATIVE_SRC_DIR := $(LATINIME_DIR_RELATIVE_TO_DICTTOOL)/native/jni/src

2
tools/dicttool/compat/com/android/inputmethod/latin/define/JniLibName.java
View File

@ -21,5 +21,5 @@ public final class JniLibName {
// This class is not publicly instantiable. // This class is not publicly instantiable.
} }
public static final String JNI_LIB_NAME = "latinime-dicttool-host"; public static final String JNI_LIB_NAME = "latinime-aosp-dicttool-host";
} }