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

Side by Side Diff: webkit/common/gpu/webkit_gpu.gyp

Issue 26315004: Remove the use_angle_translator condition. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 2 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 | « gpu/gpu.gyp ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 'conditions': [ 6 'conditions': [
7 # TODO(stuartmorgan): All dependencies from code built on iOS to 7 # TODO(stuartmorgan): All dependencies from code built on iOS to
8 # webkit/ should be removed, at which point this condition can be 8 # webkit/ should be removed, at which point this condition can be
9 # removed. 9 # removed.
10 ['OS != "ios"', { 10 ['OS != "ios"', {
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'webkit_gpu', 13 'target_name': 'webkit_gpu',
14 'type': '<(component)', 14 'type': '<(component)',
15 'variables': { 'enable_wexit_time_destructors': 1, }, 15 'variables': { 'enable_wexit_time_destructors': 1, },
16 'dependencies': [ 16 'dependencies': [
17 '<(DEPTH)/base/base.gyp:base', 17 '<(DEPTH)/base/base.gyp:base',
18 '<(DEPTH)/cc/cc.gyp:cc', 18 '<(DEPTH)/cc/cc.gyp:cc',
19 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations', 19 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.g yp:dynamic_annotations',
20 '<(DEPTH)/gpu/command_buffer/command_buffer.gyp:gles2_utils', 20 '<(DEPTH)/gpu/command_buffer/command_buffer.gyp:gles2_utils',
21 '<(DEPTH)/gpu/gpu.gyp:command_buffer_service', 21 '<(DEPTH)/gpu/gpu.gyp:command_buffer_service',
22 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib', 22 '<(DEPTH)/gpu/gpu.gyp:gles2_c_lib',
23 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation', 23 '<(DEPTH)/gpu/gpu.gyp:gles2_implementation',
24 '<(DEPTH)/skia/skia.gyp:skia', 24 '<(DEPTH)/skia/skia.gyp:skia',
25 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', 25 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
26 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator',
26 '<(DEPTH)/ui/gl/gl.gyp:gl', 27 '<(DEPTH)/ui/gl/gl.gyp:gl',
27 '<(DEPTH)/ui/gfx/gfx.gyp:gfx', 28 '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
28 '<(DEPTH)/ui/ui.gyp:ui', 29 '<(DEPTH)/ui/ui.gyp:ui',
29 ], 30 ],
30 'sources': [ 31 'sources': [
31 # This list contains all .h and .cc in gpu except for test code. 32 # This list contains all .h and .cc in gpu except for test code.
32 'context_provider_in_process.cc', 33 'context_provider_in_process.cc',
33 'context_provider_in_process.h', 34 'context_provider_in_process.h',
34 'gl_bindings_skia_cmd_buffer.cc', 35 'gl_bindings_skia_cmd_buffer.cc',
35 'gl_bindings_skia_cmd_buffer.h', 36 'gl_bindings_skia_cmd_buffer.h',
36 'grcontext_for_webgraphicscontext3d.cc', 37 'grcontext_for_webgraphicscontext3d.cc',
37 'grcontext_for_webgraphicscontext3d.h', 38 'grcontext_for_webgraphicscontext3d.h',
38 'managed_memory_policy_convert.cc', 39 'managed_memory_policy_convert.cc',
39 'managed_memory_policy_convert.h', 40 'managed_memory_policy_convert.h',
40 'test_context_provider_factory.cc', 41 'test_context_provider_factory.cc',
41 'test_context_provider_factory.h', 42 'test_context_provider_factory.h',
42 'webgraphicscontext3d_in_process_command_buffer_impl.cc', 43 'webgraphicscontext3d_in_process_command_buffer_impl.cc',
43 'webgraphicscontext3d_in_process_command_buffer_impl.h', 44 'webgraphicscontext3d_in_process_command_buffer_impl.h',
44 'webgraphicscontext3d_provider_impl.cc', 45 'webgraphicscontext3d_provider_impl.cc',
45 'webgraphicscontext3d_provider_impl.h', 46 'webgraphicscontext3d_provider_impl.h',
46 ], 47 ],
47 'defines': [ 48 'defines': [
48 'WEBKIT_GPU_IMPLEMENTATION', 49 'WEBKIT_GPU_IMPLEMENTATION',
49 ], 50 ],
50 'conditions': [
51 ['use_angle_translator==1', {
52 'dependencies': [
53 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator' ,
54 ],
55 }, {
56 'dependencies': [
57 '<(DEPTH)/third_party/angle_dx11/src/build_angle.gyp:translator_ glsl',
58 ],
59 }],
60 ],
61 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 51 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
62 'msvs_disabled_warnings': [ 4267, ], 52 'msvs_disabled_warnings': [ 4267, ],
63 }, 53 },
64 ], 54 ],
65 }], 55 }],
66 ], 56 ],
67 } 57 }
OLDNEW
« no previous file with comments | « gpu/gpu.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698