diff options
| author | Ben Murdoch <benm@google.com> | 2014-10-06 12:47:19 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-10-06 13:43:51 +0000 |
| commit | 61afed696a71ff0a288916a9319461cd880375e2 (patch) | |
| tree | 094f98593a6a72085f286d959332b5951effc57b /chromium | |
| parent | 80ea4ead5bdf2a86aa63f70c6afeebbd5c0ec6d6 (diff) | |
| download | webview-61afed696a71ff0a288916a9319461cd880375e2.tar.gz | |
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)
(cherry picked from commit 6084b0bc9180898565b917c5694a79defd0060fb)
Diffstat (limited to 'chromium')
| -rw-r--r-- | chromium/package.mk | 2 |
1 files changed, 2 insertions, 0 deletions
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 @@ LOCAL_JARJAR_RULES := $(CHROMIUM_PATH)/android_webview/build/jarjar-rules.txt 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 |