Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(206)

Unified Diff: webkit/gpu/webkit_gpu.gypi

Issue 11348231: Move gl_bindings_skia_cmd_buffer into webkit_gpu and make the latter a component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing dep Created 8 years, 1 month 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
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_impl.h ('k') | webkit/gpu/webkit_gpu_export.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/gpu/webkit_gpu.gypi
diff --git a/webkit/gpu/webkit_gpu.gypi b/webkit/gpu/webkit_gpu.gypi
index 85e1846d84c4ee2d54cbdbe9e82dcef587829774..acffd283f07d10860892d6cfc53f92f1ee306dcc 100644
--- a/webkit/gpu/webkit_gpu.gypi
+++ b/webkit/gpu/webkit_gpu.gypi
@@ -3,10 +3,19 @@
# found in the LICENSE file.
{
+ 'variables': {
+ 'conditions': [
+ ['inside_chromium_build==0', {
+ 'webkit_src_dir': '../../../../..',
+ },{
+ 'webkit_src_dir': '../../third_party/WebKit',
+ }],
+ ],
+ },
'targets': [
{
'target_name': 'webkit_gpu',
- 'type': 'static_library',
+ 'type': '<(component)',
'variables': { 'enable_wexit_time_destructors': 1, },
'dependencies': [
'<(DEPTH)/base/base.gyp:base',
@@ -16,14 +25,16 @@
'<(DEPTH)/gpu/gpu.gyp:command_buffer_client',
'<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
'<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
+ '<(DEPTH)/skia/skia.gyp:skia',
'<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl',
'<(DEPTH)/ui/gl/gl.gyp:gl',
- ],
- 'include_dirs': [
- '<(DEPTH)/skia/config',
+ '<(DEPTH)/ui/ui.gyp:ui',
+ '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
],
'sources': [
# This list contains all .h and .cc in gpu except for test code.
+ 'gl_bindings_skia_cmd_buffer.cc',
+ 'gl_bindings_skia_cmd_buffer.h',
'webgraphicscontext3d_in_process_command_buffer_impl.cc',
'webgraphicscontext3d_in_process_command_buffer_impl.h',
'webgraphicscontext3d_in_process_impl.cc',
@@ -37,6 +48,9 @@
],
}],
],
+ 'defines': [
+ 'WEBKIT_GPU_IMPLEMENTATION',
+ ],
},
],
}
« no previous file with comments | « webkit/gpu/webgraphicscontext3d_in_process_impl.h ('k') | webkit/gpu/webkit_gpu_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698