android_webview/android_webview.gyp - Issue 1083843002: android_webview: Remove dependency on webkit's ContextProviderInProcess.

Unified Diff: android_webview/android_webview.gyp

Issue 1083843002: android_webview: Remove dependency on webkit's ContextProviderInProcess. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: android_webview/android_webview.gyp

diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp

index 9fbaf73639004c48c9578ab070b16f93d94d1fee..55e11a5c5ce98863469ffb597c95c16402f3cac2 100644

--- a/android_webview/android_webview.gyp

+++ b/android_webview/android_webview.gyp

@@ -176,8 +176,10 @@

'../gpu/blink/gpu_blink.gyp:gpu_blink',

'../gpu/command_buffer/command_buffer.gyp:gles2_utils',

'../gpu/gpu.gyp:command_buffer_service',

- '../gpu/gpu.gyp:gles2_implementation',

'../gpu/gpu.gyp:gl_in_process_context',

+ '../gpu/gpu.gyp:gles2_c_lib',

+ '../gpu/gpu.gyp:gles2_implementation',

+ '../gpu/skia_bindings/skia_bindings.gyp:gpu_skia_bindings',

'../media/media.gyp:media',

'../printing/printing.gyp:printing',

'../skia/skia.gyp:skia',

@@ -185,7 +187,6 @@

'../ui/gl/gl.gyp:gl',

'../ui/shell_dialogs/shell_dialogs.gyp:shell_dialogs',

'../v8/tools/gyp/v8.gyp:v8',

- '../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',

'android_webview_pak',

'android_webview_version',

@@ -200,10 +201,10 @@

'browser/aw_browser_main_parts.cc',

'browser/aw_browser_main_parts.h',

'browser/aw_browser_permission_request_delegate.h',

- 'browser/aw_contents_client_bridge_base.cc',

- 'browser/aw_contents_client_bridge_base.h',

'browser/aw_content_browser_client.cc',

'browser/aw_content_browser_client.h',

boliu 2015/04/23 12:23:41 were you intentionally sorting this, or was presub

tfarina 2015/04/24 15:04:55 Done.

+ 'browser/aw_contents_client_bridge_base.cc',

+ 'browser/aw_contents_client_bridge_base.h',

'browser/aw_contents_io_thread_client.h',

'browser/aw_cookie_access_policy.cc',

'browser/aw_cookie_access_policy.h',

@@ -236,13 +237,15 @@

'browser/aw_quota_manager_bridge.h',

'browser/aw_quota_permission_context.cc',

'browser/aw_quota_permission_context.h',

+ 'browser/aw_render_thread_context_provider.cc',

+ 'browser/aw_render_thread_context_provider.h',

'browser/aw_request_interceptor.cc',

'browser/aw_request_interceptor.h',

'browser/aw_resource_context.cc',

'browser/aw_resource_context.h',

+ 'browser/aw_result_codes.h',

'browser/aw_ssl_host_state_delegate.cc',

'browser/aw_ssl_host_state_delegate.h',

- 'browser/aw_result_codes.h',

'browser/aw_web_preferences_populater.cc',

'browser/aw_web_preferences_populater.h',

'browser/aw_web_resource_response.cc',

« no previous file with comments | « android_webview/DEPS ('k') | android_webview/browser/DEPS » ('j') | android_webview/browser/aw_render_thread_context_provider.cc » ('J')