diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
| commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
| tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /android_webview/android_webview.gyp | |
| parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
| download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz | |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'android_webview/android_webview.gyp')
| -rw-r--r-- | android_webview/android_webview.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp index 23f63f0fcf..6abe19f770 100644 --- a/android_webview/android_webview.gyp +++ b/android_webview/android_webview.gyp @@ -55,7 +55,7 @@ 'dependencies': [ '<(DEPTH)/content/content_resources.gyp:content_resources', '<(DEPTH)/net/net.gyp:net_resources', - '<(DEPTH)/ui/ui.gyp:ui_resources', + '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', '<(DEPTH)/webkit/webkit_resources.gyp:webkit_resources', ], 'variables': { @@ -155,6 +155,7 @@ 'browser/in_process_view_renderer.cc', 'browser/in_process_view_renderer.h', 'browser/input_stream.h', + 'browser/intercepted_request_data.cc', 'browser/intercepted_request_data.h', 'browser/jni_dependency_factory.h', 'browser/gl_view_renderer_manager.cc', @@ -199,6 +200,8 @@ 'public/browser/draw_gl.h', 'renderer/aw_content_renderer_client.cc', 'renderer/aw_content_renderer_client.h', + 'renderer/aw_key_systems.cc', + 'renderer/aw_key_systems.h', 'renderer/aw_render_process_observer.cc', 'renderer/aw_render_process_observer.h', 'renderer/aw_render_view_ext.cc', @@ -212,7 +215,7 @@ '../components/components.gyp:navigation_interception_java', '../components/components.gyp:web_contents_delegate_android_java', '../content/content.gyp:content_java', - '../ui/ui.gyp:ui_java', + '../ui/android/ui_android.gyp:ui_java', ], 'variables': { 'java_in_dir': '../android_webview/java', |