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

Side by Side Diff: gpu/command_buffer_service.gypi

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 | « build/common.gypi ('k') | gpu/gpu.gyp » ('j') | 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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'include_dirs': [ 6 'include_dirs': [
7 '..', 7 '..',
8 ], 8 ],
9 'all_dependent_settings': { 9 'all_dependent_settings': {
10 'include_dirs': [ 10 'include_dirs': [
11 '..', 11 '..',
12 ], 12 ],
13 }, 13 },
14 'dependencies': [ 14 'dependencies': [
15 '../base/base.gyp:base', 15 '../base/base.gyp:base',
16 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations', 16 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_ann otations',
17 '../crypto/crypto.gyp:crypto', 17 '../crypto/crypto.gyp:crypto',
18 '../ui/gfx/gfx.gyp:gfx', 18 '../ui/gfx/gfx.gyp:gfx',
19 '../ui/gl/gl.gyp:gl', 19 '../ui/gl/gl.gyp:gl',
20 '../ui/ui.gyp:ui', 20 '../ui/ui.gyp:ui',
21 '../third_party/angle_dx11/src/build_angle.gyp:translator',
21 '../third_party/khronos/khronos.gyp:khronos_headers', 22 '../third_party/khronos/khronos.gyp:khronos_headers',
22 '../third_party/protobuf/protobuf.gyp:protobuf_lite', 23 '../third_party/protobuf/protobuf.gyp:protobuf_lite',
23 '../third_party/smhasher/smhasher.gyp:cityhash', 24 '../third_party/smhasher/smhasher.gyp:cityhash',
24 '../third_party/re2/re2.gyp:re2', 25 '../third_party/re2/re2.gyp:re2',
25 ], 26 ],
26 'sources': [ 27 'sources': [
27 'command_buffer/service/async_pixel_transfer_delegate.cc', 28 'command_buffer/service/async_pixel_transfer_delegate.cc',
28 'command_buffer/service/async_pixel_transfer_delegate.h', 29 'command_buffer/service/async_pixel_transfer_delegate.h',
29 'command_buffer/service/async_pixel_transfer_manager_android.cc', 30 'command_buffer/service/async_pixel_transfer_manager_android.cc',
30 'command_buffer/service/async_pixel_transfer_manager_idle.cc', 31 'command_buffer/service/async_pixel_transfer_manager_idle.cc',
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 ['toolkit_uses_gtk == 1', { 134 ['toolkit_uses_gtk == 1', {
134 'dependencies': [ 135 'dependencies': [
135 '../build/linux/system.gyp:gtk', 136 '../build/linux/system.gyp:gtk',
136 ], 137 ],
137 }], 138 }],
138 ['ui_compositor_image_transport==1', { 139 ['ui_compositor_image_transport==1', {
139 'include_dirs': [ 140 'include_dirs': [
140 '../third_party/khronos', 141 '../third_party/khronos',
141 ], 142 ],
142 }], 143 }],
143 ['use_angle_translator==1', {
144 'dependencies': [
145 '../third_party/angle_dx11/src/build_angle.gyp:translator',
146 ],
147 }, {
148 'dependencies': [
149 '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
150 ],
151 }],
152 ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', { 144 ['OS in ("win", "android") or (OS == "linux" and use_x11 == 1)', {
153 'sources': [ 145 'sources': [
154 'command_buffer/service/async_pixel_transfer_manager_egl.cc', 146 'command_buffer/service/async_pixel_transfer_manager_egl.cc',
155 'command_buffer/service/async_pixel_transfer_manager_egl.h', 147 'command_buffer/service/async_pixel_transfer_manager_egl.h',
156 ], 148 ],
157 }] 149 }]
158 ], 150 ],
159 } 151 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | gpu/gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698