From 910457e37a45c4c717466aadfdf9d3fcd62135d4 Mon Sep 17 00:00:00 2001
From: Yanjia Li
Date: Wed, 5 Jul 2017 16:39:10 +0800
Subject: [PATCH] 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 | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Android.mk b/Android.mk
index 0466a1fd69a..938112ae584 100644
--- a/Android.mk
+++ b/Android.mk
@@ -18,6 +18,8 @@ LOCAL_PRIVILEGED_MODULE := true
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 := \