commit 6084b0bc9180898565b917c5694a79defd0060fb
author Ben Murdoch <benm@google.com> Mon Oct 06 12:47:19 2014 +0100
committer Ben Murdoch <benm@google.com> Mon Oct 06 13:43:32 2014 +0000
tree 71b8727fdb0ca1cc0fa0c0188fb616e9487e3ab0
parent ca3ebe61951d92501599e3120c0fd30b0d7264de

Use overridden resources.

Updates the WebView build rule to take into account any
overridden resources.

Bug: 16902981
Change-Id: Ie8dea10fc093379afeff37a6e7b9c972370d5ad5
(cherry picked from commit d6a17bc6ba1bc12e43f180397abacb8c1cd194ec)

chromium/package.mk

diff --git a/chromium/package.mk b/chromium/package.mk
index 6ad4373..4f87464 100644
--- a/chromium/package.mk
+++ b/chromium/package.mk
@@ -44,8 +44,10 @@
 
 include $(CHROMIUM_PATH)/android_webview/build/resources_config.mk
 LOCAL_RESOURCE_DIR := \
+    $(res_overrides) \
     $(LOCAL_PATH)/res \
     $(android_webview_resources_dirs)
+
 LOCAL_AAPT_FLAGS := $(android_webview_aapt_flags)
 LOCAL_AAPT_FLAGS += --extra-packages com.android.webview.chromium
 LOCAL_AAPT_FLAGS += --shared-lib