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

Merge "DO NOT MERGE: Abolish source code overlay and introduce overridable src dir" into lmp-dev

main
Ken Wakasa 2014-08-20 10:18:52 +00:00 committed by Android (Google) Code Review
parent fa39ffcf84 0b3e48fb50
commit c37205f5ab
17 changed files with 23 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
java/src/com/android/inputmethod/compat/AppWorkaroundsHelper.java → java-overridable/src/com/android/inputmethod/compat/AppWorkaroundsHelper.java
View File

0
java/src/com/android/inputmethod/dictionarypack/DictionaryPackConstants.java → java-overridable/src/com/android/inputmethod/dictionarypack/DictionaryPackConstants.java
View File

0
java/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java → java-overridable/src/com/android/inputmethod/dictionarypack/MetadataUriGetter.java
View File

0
java/src/com/android/inputmethod/latin/SpecialKeyDetector.java → java-overridable/src/com/android/inputmethod/latin/SpecialKeyDetector.java
View File

0
java/src/com/android/inputmethod/latin/about/AboutPreferences.java → java-overridable/src/com/android/inputmethod/latin/about/AboutPreferences.java
View File

0
java/src/com/android/inputmethod/latin/define/DebugFlags.java → java-overridable/src/com/android/inputmethod/latin/define/DebugFlags.java
View File

0
java/src/com/android/inputmethod/latin/define/JniLibName.java → java-overridable/src/com/android/inputmethod/latin/define/JniLibName.java
View File

0
java/src/com/android/inputmethod/latin/define/ProductionFlags.java → java-overridable/src/com/android/inputmethod/latin/define/ProductionFlags.java
View File

0
java/src/com/android/inputmethod/latin/personalization/ContextualDictionaryUpdater.java → java-overridable/src/com/android/inputmethod/latin/personalization/ContextualDictionaryUpdater.java
View File

0
java/src/com/android/inputmethod/latin/personalization/PersonalizationDictionaryUpdater.java → java-overridable/src/com/android/inputmethod/latin/personalization/PersonalizationDictionaryUpdater.java
View File

0
java/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java → java-overridable/src/com/android/inputmethod/latin/settings/AdditionalFeaturesSettingUtils.java
View File

0
java/src/com/android/inputmethod/latin/utils/FeedbackUtils.java → java-overridable/src/com/android/inputmethod/latin/utils/FeedbackUtils.java
View File

0
java/src/com/android/inputmethod/latin/utils/FileTransforms.java → java-overridable/src/com/android/inputmethod/latin/utils/FileTransforms.java
View File

0
java/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java → java-overridable/src/com/android/inputmethod/latin/utils/MetadataFileUriGetter.java
View File

0
java/src/com/android/inputmethod/latin/utils/StatsUtils.java → java-overridable/src/com/android/inputmethod/latin/utils/StatsUtils.java
View File

2
java/Android.mk
View File

@ -17,7 +17,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_SRC_FILES := $(call all-java-files-under, src ../java-overridable/src)
LOCAL_PACKAGE_NAME := LatinIME LOCAL_PACKAGE_NAME := LatinIME

39
tools/dicttool/Android.mk
View File

@ -32,10 +32,12 @@ LOCAL_PATH := $(LATINIME_DICTTOOL_AOSP_LOCAL_PATH)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LATINIME_LOCAL_DIR := ../.. LATINIME_LOCAL_DIR := ../..
LATINIME_BASE_SOURCE_DIRECTORY := $(LATINIME_LOCAL_DIR)/java/src/com/android/inputmethod LATINIME_BASE_SRC_DIR := $(LATINIME_LOCAL_DIR)/java/src/com/android/inputmethod
LATINIME_ANNOTATIONS_SOURCE_DIRECTORY := $(LATINIME_BASE_SOURCE_DIRECTORY)/annotations LATINIME_BASE_OVERRIDABLE_SRC_DIR := \
MAKEDICT_CORE_SOURCE_DIRECTORY := $(LATINIME_BASE_SOURCE_DIRECTORY)/latin/makedict $(LATINIME_LOCAL_DIR)/java-overridable/src/com/android/inputmethod
LATINIME_TESTS_SOURCE_DIRECTORY := $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin LATINIME_ANNOTATIONS_SRC_DIR := $(LATINIME_BASE_SRC_DIR)/annotations
MAKEDICT_CORE_SRC_DIR := $(LATINIME_BASE_SRC_DIR)/latin/makedict
LATINIME_TESTS_SRC_DIR := $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin
# 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
@ -51,7 +53,6 @@ LATINIME_SRC_FILES_FOR_DICTTOOL := \
latin/PrevWordsInfo.java \ latin/PrevWordsInfo.java \
latin/SuggestedWords.java \ latin/SuggestedWords.java \
latin/WordComposer.java \ latin/WordComposer.java \
latin/define/DebugFlags.java \
latin/settings/NativeSuggestOptions.java \ latin/settings/NativeSuggestOptions.java \
latin/settings/SettingsValuesForSuggestion.java \ latin/settings/SettingsValuesForSuggestion.java \
latin/utils/BinaryDictionaryUtils.java \ latin/utils/BinaryDictionaryUtils.java \
@ -63,29 +64,33 @@ LATINIME_SRC_FILES_FOR_DICTTOOL := \
latin/utils/ResizableIntArray.java \ latin/utils/ResizableIntArray.java \
latin/utils/StringUtils.java latin/utils/StringUtils.java
LATINIME_OVERRIDABLE_SRC_FILES_FOR_DICTTOOL := \
latin/define/DebugFlags.java
LATINIME_TEST_SRC_FILES_FOR_DICTTOOL := \ LATINIME_TEST_SRC_FILES_FOR_DICTTOOL := \
utils/ByteArrayDictBuffer.java utils/ByteArrayDictBuffer.java
USED_TARGETED_SRCS := \ USED_TARGETED_SRC_FILES := \
$(addprefix $(LATINIME_BASE_SOURCE_DIRECTORY)/, $(LATINIME_SRC_FILES_FOR_DICTTOOL)) \ $(addprefix $(LATINIME_BASE_SRC_DIR)/, $(LATINIME_SRC_FILES_FOR_DICTTOOL)) \
$(addprefix $(LATINIME_TESTS_SOURCE_DIRECTORY)/, $(LATINIME_TEST_SRC_FILES_FOR_DICTTOOL)) $(addprefix $(LATINIME_BASE_OVERRIDABLE_SRC_DIR)/, \
$(LATINIME_OVERRIDABLE_SRC_FILES_FOR_DICTTOOL)) \
$(addprefix $(LATINIME_TESTS_SRC_DIR)/, $(LATINIME_TEST_SRC_FILES_FOR_DICTTOOL))
DICTTOOL_ONDEVICE_TESTS_DIRECTORY := \ DICTTOOL_ONDEVICE_TESTS_DIR := \
$(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin/makedict/ $(LATINIME_LOCAL_DIR)/tests/src/com/android/inputmethod/latin/makedict/
DICTTOOL_COMPAT_TESTS_DIRECTORY := compat DICTTOOL_COMPAT_TESTS_DIR := compat
LOCAL_MAIN_SRC_FILES := $(call all-java-files-under, $(MAKEDICT_CORE_SOURCE_DIRECTORY)) LOCAL_MAIN_SRC_FILES := $(call all-java-files-under, $(MAKEDICT_CORE_SRC_DIR))
LOCAL_TOOL_SRC_FILES := $(call all-java-files-under, src) LOCAL_TOOL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_ANNOTATIONS_SRC_FILES := \ LOCAL_ANNOTATIONS_SRC_FILES := $(call all-java-files-under, $(LATINIME_ANNOTATIONS_SRC_DIR))
$(call all-java-files-under, $(LATINIME_ANNOTATIONS_SOURCE_DIRECTORY))
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)) \
$(call all-java-files-under, $(DICTTOOL_COMPAT_TESTS_DIRECTORY)) \ $(call all-java-files-under, $(DICTTOOL_COMPAT_TESTS_DIR)) \
$(LOCAL_ANNOTATIONS_SRC_FILES) $(USED_TARGETED_SRCS) \ $(LOCAL_ANNOTATIONS_SRC_FILES) $(USED_TARGETED_SRC_FILES) \
$(LATINIME_BASE_SOURCE_DIRECTORY)/latin/Constants.java \ $(LATINIME_BASE_SRC_DIR)/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_DIR))
LOCAL_JAVA_LIBRARIES := junit LOCAL_JAVA_LIBRARIES := junit
LOCAL_STATIC_JAVA_LIBRARIES := jsr305lib LOCAL_STATIC_JAVA_LIBRARIES := jsr305lib