diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-05-14 12:12:37 +0100 |
| commit | 010d83a9304c5a91596085d917d248abff47903a (patch) | |
| tree | 41ef1a01862f352f9653c7a9cfa817abefe2cce2 /android_webview/android_webview.gyp | |
| parent | 08c107de54178bb0990a09adec724924e8bc9486 (diff) | |
| download | chromium_org-010d83a9304c5a91596085d917d248abff47903a.tar.gz | |
Merge from Chromium at DEPS revision 269336
This commit was generated by merge_to_master.py.
Change-Id: I8b9c77f10eccd2a8b4c7ce373ffda18568af54ff
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index bc28dc281e..f84eccd3d2 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -90,6 +90,9 @@ '../android_webview/native/webview_native.gyp:webview_native', '../components/components.gyp:auto_login_parser', '../components/components.gyp:autofill_content_renderer', + '../components/components.gyp:cdm_browser', + '../components/components.gyp:cdm_renderer', + '../components/components.gyp:data_reduction_proxy_browser', '../components/components.gyp:navigation_interception', '../components/components.gyp:visitedlink_browser', '../components/components.gyp:visitedlink_renderer', @@ -97,6 +100,7 @@ '../content/content.gyp:content_app_both', '../gpu/gpu.gyp:command_buffer_service', '../gpu/gpu.gyp:gles2_implementation', + '../media/media.gyp:media', '../printing/printing.gyp:printing', '../skia/skia.gyp:skia', '../third_party/WebKit/public/blink.gyp:blink', @@ -152,6 +156,9 @@ 'browser/browser_view_renderer_client.h', 'browser/find_helper.cc', 'browser/find_helper.h', + 'browser/global_tile_manager.cc', + 'browser/global_tile_manager.h', + 'browser/global_tile_manager_client.h', 'browser/gpu_memory_buffer_factory_impl.cc', 'browser/gpu_memory_buffer_factory_impl.h', 'browser/hardware_renderer.cc', |