| commit | 8ef38e1939cc504f095d02daa3d2a0a1079e9d9b | [log] [tgz] |
|---|---|---|
| author | Andrii Kulian <akulian@google.com> | Fri Mar 01 18:13:47 2019 -0800 |
| committer | android-build-merger <android-build-merger@google.com> | Fri Mar 01 18:13:47 2019 -0800 |
| tree | 5b9b10d127eae247a6f33893a5f0e5cc2ce1d9ae | |
| parent | 08415faf4a4ce2dcbe44515d5d7adfd3205873cd [diff] | |
| parent | c307426ebe7f042361cff76ae31ce95211ac5e07 [diff] |
Merge "Revert "Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"""" am: 50a39ba9a9 am: c307426ebe Change-Id: I3888d6a447a5b9ea588ee0e93c4c0f91626f1b70
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 := \