commit 910457e37a45c4c717466aadfdf9d3fcd62135d4
author Yanjia Li <li.x.yanjia@sony.com> Wed Jul 05 16:39:10 2017 +0800
committer Takamasa Kuramitsu <takamasa.kuramitsu@sony.com> Fri Sep 28 15:03:37 2018 +0000
tree 6272f61edfb2e02b50110064515800cf5b3bb4a4
parent ec65174f118dd6236723add199bdbd8510e63d92

Add LOCAL_RESOURCE_DIR in Settings makefile

Include local Settings resources in build - a result of adding
SettingsLib without defining a LOCAL_RESOURCE_DIR. See comment in:

 frameworks/base/packages/SettingsLib/common.mk

Bug: 116821732
Test: build & manual
Change-Id: I98712af7c568a70ee5c4bcc7bb1c19de4f30ff05

Android.mk

diff --git a/Android.mk b/Android.mk
index 0466a1f..938112a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,8 @@
 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 := \