diff options
author | 2018-05-06 20:46:17 -0700 | |
---|---|---|
committer | 2018-05-06 20:46:17 -0700 | |
commit | 7a2459ca13c42ae3f3e07d43b671e78d5c4939c7 (patch) | |
tree | 0f93248421f032bf27bbdb0ac27f57a87cc0248c /java/Android.mk | |
parent | b280820dc4cb10d5c0fdae68c92fed6bd1481ac7 (diff) | |
download | latinime-7a2459ca13c42ae3f3e07d43b671e78d5c4939c7.tar.gz latinime-7a2459ca13c42ae3f3e07d43b671e78d5c4939c7.tar.xz latinime-7a2459ca13c42ae3f3e07d43b671e78d5c4939c7.zip |
Merge java-overridable/ into java/ again
This CL a logical revert of a previous CL [1], which separated Java
files into common ones and overridable ones. Now that that overriding
concept is no longer used, there is no need to keep having separate
directory structure.
[1]: Ic734bd4d20aa050c688a3158b1a382ae0ac18991
fb74ab15c1343084740d65ef8744cad33a678e82
Fix: 79323502
Test: make -j aosp_taimen-userdebug && make -j
Test: tapas LatinIME && make -j
Change-Id: I2090bc25d18e6d4f24e91c2cbfe832755cbb4e8f
Diffstat (limited to 'java/Android.mk')
-rw-r--r-- | java/Android.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/Android.mk b/java/Android.mk index 154f3a20c..837b2d9e3 100644 --- a/java/Android.mk +++ b/java/Android.mk @@ -17,7 +17,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional -LOCAL_SRC_FILES := $(call all-java-files-under, src ../java-overridable/src) +LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := LatinIME |