diff options
| author | Marcin Kosiba <mkosiba@chromium.org> | 2015-01-13 14:32:27 +0000 |
|---|---|---|
| committer | Marcin Kosiba <mkosiba@chromium.org> | 2015-01-13 14:34:08 +0000 |
| commit | 56a8804fce1b48fbf0e02e8ba40536563c3ad349 (patch) | |
| tree | 29392c549f0fb3926b2a2a50dc1a177cfeef8a90 /android_webview | |
| parent | 3533744a78eca55294294c0ce62875aff224f82c (diff) | |
| download | chromium_src-56a8804fce1b48fbf0e02e8ba40536563c3ad349.zip chromium_src-56a8804fce1b48fbf0e02e8ba40536563c3ad349.tar.gz chromium_src-56a8804fce1b48fbf0e02e8ba40536563c3ad349.tar.bz2 | |
[android_webview] Add the apk resources to the Android build.
This adds the resources from the apk/ folder to the Android build
to enable removing the downstream resources.
BUG=None
TESTS=android_aosp bot
R=torne@chromium.org
TBR=torne@chromium.org
Review URL: https://codereview.chromium.org/828153004
Cr-Commit-Position: refs/heads/master@{#311268}
Diffstat (limited to 'android_webview')
| -rw-r--r-- | android_webview/build/resources_config.mk | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/android_webview/build/resources_config.mk b/android_webview/build/resources_config.mk index cf4a3b0..a185f21 100644 --- a/android_webview/build/resources_config.mk +++ b/android_webview/build/resources_config.mk @@ -11,6 +11,7 @@ android_webview_manifest_file := $(call my-dir)/AndroidManifest.xml # Resources. android_webview_resources_dirs := \ $(call my-dir)/../java/res \ + $(call my-dir)/../apk/java/res \ $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_content_resources/jarjar_res \ $(call intermediates-dir-for,GYP,shared)/android_webview_jarjar_ui_resources/jarjar_res \ $(call intermediates-dir-for,GYP,ui_strings_grd)/ui_strings_grd/res_grit \ |