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

Side by Side Diff: webkit/gpu/webkit_gpu.gypi

Issue 9150022: Revert r118525 / Re-land r118240 - the build failure was a flake. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 11 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « third_party/khronos/GLES2/gl2platform.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'webkit_gpu', 8 'target_name': 'webkit_gpu',
9 'type': 'static_library', 9 'type': 'static_library',
10 'variables': { 'enable_wexit_time_destructors': 1, }, 10 'variables': { 'enable_wexit_time_destructors': 1, },
11 'dependencies': [ 11 'dependencies': [
12 '<(DEPTH)/base/base.gyp:base', 12 '<(DEPTH)/base/base.gyp:base',
13 » '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', 13 '<(DEPTH)/gpu/gpu.gyp:command_buffer_service',
14 » '<(DEPTH)/gpu/gpu.gyp:command_buffer_client', 14 '<(DEPTH)/gpu/gpu.gyp:command_buffer_client',
15 » '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 15 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
16 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
16 '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl', 17 '<(DEPTH)/third_party/angle/src/build_angle.gyp:translator_glsl',
17 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', 18 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
18 ], 19 ],
19 'include_dirs': [ 20 'include_dirs': [
20 '<(DEPTH)/skia/config', 21 '<(DEPTH)/skia/config',
21 ], 22 ],
22 'sources': [ 23 'sources': [
23 # This list contains all .h and .cc in gpu except for test code. 24 # This list contains all .h and .cc in gpu except for test code.
24 'webgraphicscontext3d_in_process_command_buffer_impl.cc', 25 'webgraphicscontext3d_in_process_command_buffer_impl.cc',
25 'webgraphicscontext3d_in_process_command_buffer_impl.h', 26 'webgraphicscontext3d_in_process_command_buffer_impl.h',
26 'webgraphicscontext3d_in_process_impl.cc', 27 'webgraphicscontext3d_in_process_impl.cc',
27 'webgraphicscontext3d_in_process_impl.h', 28 'webgraphicscontext3d_in_process_impl.h',
28 'webkit_gpu.gypi', 29 'webkit_gpu.gypi',
29 ], 30 ],
30 'conditions': [ 31 'conditions': [
31 ['inside_chromium_build==0', { 32 ['inside_chromium_build==0', {
32 'dependencies': [ 33 'dependencies': [
33 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers', 34 '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
34 ], 35 ],
35 }], 36 }],
36 ], 37 ],
37 }, 38 },
38 ], 39 ],
39 } 40 }
OLDNEW
« no previous file with comments | « third_party/khronos/GLES2/gl2platform.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698