diff options
author | Ben Murdoch <benm@google.com> | 2013-08-06 11:01:04 +0100 |
---|---|---|
committer | Ben Murdoch <benm@google.com> | 2013-08-06 11:01:04 +0100 |
commit | 2385ea399aae016c0806a4f9ef3c9cfe3d2a39df (patch) | |
tree | e910e76d19265ff3230c473da95410d3f3a007af /android_webview/android_webview.gyp | |
parent | 8ee924b76946696c0f52e56d28cc5ab741919041 (diff) | |
download | chromium_org-2385ea399aae016c0806a4f9ef3c9cfe3d2a39df.tar.gz |
Merge from Chromium at DEPS revision r215849
This commit was generated by merge_to_master.py.
Change-Id: I225a31651af894e33bdd71e7121702bcbe5310f4
Diffstat (limited to 'android_webview/android_webview.gyp')
-rw-r--r-- | android_webview/android_webview.gyp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 1ddbe4fb58..c2f23a3e56 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -80,7 +80,7 @@ '../components/components.gyp:visitedlink_browser', '../components/components.gyp:visitedlink_renderer', '../components/components.gyp:web_contents_delegate_android', - '../content/content.gyp:content', + '../content/content.gyp:content_app_both', '../skia/skia.gyp:skia', '../gpu/gpu.gyp:command_buffer_service', '../gpu/gpu.gyp:gles2_implementation', |