Index: android_webview/android_webview.gyp |
diff --git a/android_webview/android_webview.gyp b/android_webview/android_webview.gyp |
index fb4c3fffa703f30af8ad52e5ec702436cf32a824..3cf32ec790a57a30fa3924fefa184fe5274da7d9 100644 |
--- a/android_webview/android_webview.gyp |
+++ b/android_webview/android_webview.gyp |
@@ -175,8 +175,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', |
@@ -184,7 +186,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', |
], |
@@ -199,10 +200,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', |
+ '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', |
@@ -233,13 +234,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', |