diff options
| author | Fan Zhang <zhfan@google.com> | 2019-02-13 10:43:46 -0800 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-02-13 10:43:46 -0800 |
| commit | ca79899ebfd20aadda253223c88e2312b40e328b (patch) | |
| tree | cba68e7ecf547797bae6508e17e2332bb39cef2a /Android.mk | |
| parent | 469f1a345e50fb51cb3f6380b9f1ac307e851fca (diff) | |
| parent | 798c93aafccf63c0831e9396802da653e771cc6b (diff) | |
| download | packages_apps_Settings-ca79899ebfd20aadda253223c88e2312b40e328b.tar.gz packages_apps_Settings-ca79899ebfd20aadda253223c88e2312b40e328b.tar.bz2 packages_apps_Settings-ca79899ebfd20aadda253223c88e2312b40e328b.zip | |
Merge "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile"" am: dabfd96c82 am: 32fbf4740d
am: 798c93aafc
Change-Id: I39c11b23af004e0eb24b3c68eef6373eb70188ec
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index cc45130146..e385b34051 100644 --- a/Android.mk +++ b/Android.mk @@ -20,8 +20,6 @@ LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.settings 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 := \ |