commit e7fe45f4cad79a9f51d3f4b8c1b7917dd485bbf2
author Takamasa Kuramitsu <takamasa.kuramitsu@sony.com> Fri Mar 01 00:22:38 2019 +0000
committer Takamasa Kuramitsu <takamasa.kuramitsu@sony.com> Fri Mar 01 00:22:38 2019 +0000
tree 6272f61edfb2e02b50110064515800cf5b3bb4a4
parent 1ea003e8347237e5f6a4a696aa741a32d169e620

Revert "Revert "Add LOCAL_RESOURCE_DIR in Settings makefile""

This reverts commit 1ea003e8347237e5f6a4a696aa741a32d169e620.
Fixes: 116821732

Reason for revert: blocking issue in b/124370422 is resolved

Change-Id: Ie3d5489e5addf12ed7feeada0ceac196eb272f6b

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 := \