diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-05 13:57:33 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-05 13:57:33 +0100 |
| commit | a36e5920737c6adbddd3e43b760e5de8431db6e0 (patch) | |
| tree | 347d048bb8c8828d50113bf94ace40bf0613f2cd /android_webview/android_webview.gyp | |
| parent | 34378da0e9429d394aafdaa771301aff58447cb1 (diff) | |
| download | chromium_org-a36e5920737c6adbddd3e43b760e5de8431db6e0.tar.gz | |
Merge from Chromium at DEPS revision r215573
This commit was generated by merge_to_master.py.
Change-Id: Ib95814f98e5765b459dd32425f9bf9138edf2bca
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 299dc12783..1ddbe4fb58 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -54,7 +54,6 @@ '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/blink_resources.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', ], }, @@ -139,6 +138,8 @@ 'browser/input_stream.h', 'browser/intercepted_request_data.h', 'browser/jni_dependency_factory.h', + 'browser/gl_view_renderer_manager.cc', + 'browser/gl_view_renderer_manager.h', 'browser/net/android_stream_reader_url_request_job.cc', 'browser/net/android_stream_reader_url_request_job.h', 'browser/net/aw_network_delegate.cc', |