diff options
| author | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 22:47:21 +0000 |
|---|---|---|
| committer | mkosiba@chromium.org <mkosiba@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-20 22:47:21 +0000 |
| commit | ca6b5d0f13f12c9accc65a683f5868fc5d3c15b0 (patch) | |
| tree | e114ab50e10975d556fcacb96055ec4b493ce922 /content | |
| parent | e3fd0bd10b02144e394532f2be15cfc0cfe27382 (diff) | |
| download | chromium_src-ca6b5d0f13f12c9accc65a683f5868fc5d3c15b0.zip chromium_src-ca6b5d0f13f12c9accc65a683f5868fc5d3c15b0.tar.gz chromium_src-ca6b5d0f13f12c9accc65a683f5868fc5d3c15b0.tar.bz2 | |
JarJar resources when building the android_webview.
The android_webview build will require there only be
a single R class (details in bug).
This change makes the necessary changes to the build
infrastructure for this to happen but the actual swap
to building the webview this way will land as a subsequent
CL.
BUG=387155
build-only change, all trybots compile fine.
NOTRY=true
Review URL: https://codereview.chromium.org/255613003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@278849 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/content.gyp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/content.gyp b/content/content.gyp index cb0353a..fbd3b7d 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -412,6 +412,8 @@ }, { 'target_name': 'content_strings_grd', + # The android_webview/Android.mk file depends on this target directly. + 'android_unmangled_name': 1, 'type': 'none', 'variables': { 'grd_file': '../content/public/android/java/strings/android_content_strings.grd', |