| commit | 32fbf4740d5895233d2324fe26ba03421ce92dac | [log] [tgz] |
|---|---|---|
| author | Fan Zhang <zhfan@google.com> | Wed Feb 13 10:16:15 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Wed Feb 13 10:16:15 2019 -0800 |
| tree | aafd7a3294b7c1c220f7792e7a0697a1035fd78c | |
| parent | 0ac1c323b25bab416d076cc9a145f9c5d1057761 [diff] | |
| parent | dabfd96c82fedafe2829f7e2b8b90ab02b7963b2 [diff] |
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82 Change-Id: I3e0b3d34cc3dbca46b96910fe0b656d6b07c03d9
diff --git a/Android.mk b/Android.mk index aab265b..3be56c3 100644 --- a/Android.mk +++ b/Android.mk
@@ -20,8 +20,6 @@ LOCAL_MODULE_TAGS := optional LOCAL_USE_AAPT2 := true -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res - LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_STATIC_ANDROID_LIBRARIES := \