diff options
| author | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2013-07-10 11:40:50 +0100 |
| commit | eb525c5499e34cc9c4b825d6d9e75bb07cc06ace (patch) | |
| tree | d908ce4bfe1717d2cd53f41327d8b9ba8304355f /android_webview/android_webview.gyp | |
| parent | 3c54152607de4272b3da0c146b71dcba8a0e5610 (diff) | |
| download | chromium_org-eb525c5499e34cc9c4b825d6d9e75bb07cc06ace.tar.gz | |
Merge from Chromium at DEPS revision r210036
This commit was generated by merge_to_master.py.
Change-Id: Ib0e33a83ad5dfa541481e83d7acfc6970e68f471
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index f6b70ddc27..b78816ad50 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -28,7 +28,6 @@ 'target_name': 'android_webview_pak', 'type': 'none', 'dependencies': [ - '<(DEPTH)/content/browser/devtools/devtools_resources.gyp:devtools_resources', '<(DEPTH)/content/content_resources.gyp:content_resources', '<(DEPTH)/net/net.gyp:net_resources', '<(DEPTH)/ui/ui.gyp:ui_resources', @@ -45,7 +44,6 @@ '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.pak', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources_100_percent.pak', ], @@ -68,6 +66,7 @@ 'dependencies': [ '../android_webview/native/webview_native.gyp:webview_native', '../components/components.gyp:auto_login_parser', + '../components/components.gyp:autofill_content_renderer', '../components/components.gyp:navigation_interception', '../components/components.gyp:visitedlink_browser', '../components/components.gyp:visitedlink_renderer', @@ -85,8 +84,6 @@ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/', ], 'sources': [ - 'browser/aw_autofill_manager_delegate.cc', - 'browser/aw_autofill_manager_delegate.h', 'browser/aw_browser_context.cc', 'browser/aw_browser_context.h', 'browser/aw_browser_main_parts.cc', |