| Index: webkit/gpu/webkit_gpu.gyp
|
| diff --git a/webkit/gpu/webkit_gpu.gyp b/webkit/gpu/webkit_gpu.gyp
|
| index 5db1fa7825ef54f341cea216a602260ecd348898..9d40d8c9192127d07dd5ff294c5ec8dd26ddbf06 100644
|
| --- a/webkit/gpu/webkit_gpu.gyp
|
| +++ b/webkit/gpu/webkit_gpu.gyp
|
| @@ -8,15 +8,6 @@
|
| # webkit/ should be removed, at which point this condition can be
|
| # removed.
|
| ['OS != "ios"', {
|
| - 'variables': {
|
| - 'conditions': [
|
| - ['inside_chromium_build==0', {
|
| - 'webkit_src_dir': '../../../../..',
|
| - },{
|
| - 'webkit_src_dir': '../../third_party/WebKit',
|
| - }],
|
| - ],
|
| - },
|
| 'targets': [
|
| {
|
| 'target_name': 'webkit_gpu',
|
| @@ -26,15 +17,15 @@
|
| '<(DEPTH)/base/base.gyp:base',
|
| '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| '<(DEPTH)/gpu/command_buffer/command_buffer.gyp:gles2_utils',
|
| - '<(DEPTH)/gpu/gpu.gyp:command_buffer_service',
|
| '<(DEPTH)/gpu/gpu.gyp:command_buffer_client',
|
| + '<(DEPTH)/gpu/gpu.gyp:command_buffer_service',
|
| '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
|
| '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
|
| '<(DEPTH)/skia/skia.gyp:skia',
|
| + '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
|
| '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl',
|
| '<(DEPTH)/ui/gl/gl.gyp:gl',
|
| '<(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.
|
| @@ -51,13 +42,6 @@
|
| 'webgraphicscontext3d_in_process_impl.cc',
|
| 'webgraphicscontext3d_in_process_impl.h',
|
| ],
|
| - 'conditions': [
|
| - ['inside_chromium_build==0', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
|
| - ],
|
| - }],
|
| - ],
|
| 'defines': [
|
| 'WEBKIT_GPU_IMPLEMENTATION',
|
| ],
|
|
|