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

Side by Side Diff: gpu/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/command_buffer_service.gypi ('k') | webkit/common/gpu/webkit_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 'variables': { 6 'variables': {
7 'nacl_win64_target': 0, 7 'nacl_win64_target': 0,
8 }, 8 },
9 'includes': [ 9 'includes': [
10 'gpu_common.gypi', 10 'gpu_common.gypi',
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 }, 119 },
120 { 120 {
121 'target_name': 'gpu_unittests', 121 'target_name': 'gpu_unittests',
122 'type': '<(gtest_target_type)', 122 'type': '<(gtest_target_type)',
123 'dependencies': [ 123 'dependencies': [
124 '../base/base.gyp:base', 124 '../base/base.gyp:base',
125 '../base/base.gyp:test_support_base', 125 '../base/base.gyp:test_support_base',
126 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 126 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
127 '../testing/gmock.gyp:gmock', 127 '../testing/gmock.gyp:gmock',
128 '../testing/gtest.gyp:gtest', 128 '../testing/gtest.gyp:gtest',
129 '../third_party/angle_dx11/src/build_angle.gyp:translator',
129 '../ui/gl/gl.gyp:gl', 130 '../ui/gl/gl.gyp:gl',
130 '../ui/gfx/gfx.gyp:gfx', 131 '../ui/gfx/gfx.gyp:gfx',
131 'command_buffer/command_buffer.gyp:gles2_utils', 132 'command_buffer/command_buffer.gyp:gles2_utils',
132 'command_buffer_client', 133 'command_buffer_client',
133 'command_buffer_common', 134 'command_buffer_common',
134 'command_buffer_service', 135 'command_buffer_service',
135 'gpu', 136 'gpu',
136 'gpu_unittest_utils', 137 'gpu_unittest_utils',
137 'gles2_implementation_client_side_arrays', 138 'gles2_implementation_client_side_arrays',
138 'gles2_cmd_helper', 139 'gles2_cmd_helper',
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 'dependencies': [ 234 'dependencies': [
234 '../testing/android/native_test.gyp:native_test_native_code', 235 '../testing/android/native_test.gyp:native_test_native_code',
235 ], 236 ],
236 }], 237 }],
237 # See http://crbug.com/162998#c4 for why this is needed. 238 # See http://crbug.com/162998#c4 for why this is needed.
238 ['OS=="linux" and linux_use_tcmalloc==1', { 239 ['OS=="linux" and linux_use_tcmalloc==1', {
239 'dependencies': [ 240 'dependencies': [
240 '../base/allocator/allocator.gyp:allocator', 241 '../base/allocator/allocator.gyp:allocator',
241 ], 242 ],
242 }], 243 }],
243 ['use_angle_translator==1', {
244 'dependencies': [
245 '../third_party/angle_dx11/src/build_angle.gyp:translator',
246 ],
247 }, {
248 'dependencies': [
249 '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
250 ],
251 }],
252 ], 244 ],
253 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 245 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
254 'msvs_disabled_warnings': [ 4267, ], 246 'msvs_disabled_warnings': [ 4267, ],
255 }, 247 },
256 { 248 {
257 'target_name': 'gl_tests', 249 'target_name': 'gl_tests',
258 'type': '<(gtest_target_type)', 250 'type': '<(gtest_target_type)',
259 'dependencies': [ 251 'dependencies': [
260 '../base/base.gyp:base', 252 '../base/base.gyp:base',
261 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 253 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
262 '../testing/gmock.gyp:gmock', 254 '../testing/gmock.gyp:gmock',
263 '../testing/gtest.gyp:gtest', 255 '../testing/gtest.gyp:gtest',
256 '../third_party/angle_dx11/src/build_angle.gyp:translator',
264 '../ui/gfx/gfx.gyp:gfx', 257 '../ui/gfx/gfx.gyp:gfx',
265 'command_buffer/command_buffer.gyp:gles2_utils', 258 'command_buffer/command_buffer.gyp:gles2_utils',
266 'command_buffer_client', 259 'command_buffer_client',
267 'command_buffer_common', 260 'command_buffer_common',
268 'command_buffer_service', 261 'command_buffer_service',
269 'gpu', 262 'gpu',
270 'gpu_unittest_utils', 263 'gpu_unittest_utils',
271 'gles2_implementation_client_side_arrays', 264 'gles2_implementation_client_side_arrays',
272 'gles2_cmd_helper', 265 'gles2_cmd_helper',
273 #'gl_unittests', 266 #'gl_unittests',
(...skipping 28 matching lines...) Expand all
302 'command_buffer/tests/gl_unittests_android.cc', 295 'command_buffer/tests/gl_unittests_android.cc',
303 'command_buffer/tests/gl_virtual_contexts_unittests.cc', 296 'command_buffer/tests/gl_virtual_contexts_unittests.cc',
304 'command_buffer/tests/occlusion_query_unittests.cc', 297 'command_buffer/tests/occlusion_query_unittests.cc',
305 ], 298 ],
306 'conditions': [ 299 'conditions': [
307 ['OS == "android" and gtest_target_type == "shared_library"', { 300 ['OS == "android" and gtest_target_type == "shared_library"', {
308 'dependencies': [ 301 'dependencies': [
309 '../testing/android/native_test.gyp:native_test_native_code', 302 '../testing/android/native_test.gyp:native_test_native_code',
310 ], 303 ],
311 }], 304 }],
312 ['use_angle_translator==1', {
313 'dependencies': [
314 '../third_party/angle_dx11/src/build_angle.gyp:translator',
315 ],
316 }, {
317 'dependencies': [
318 '../third_party/angle_dx11/src/build_angle.gyp:translator_glsl',
319 ],
320 }],
321 ], 305 ],
322 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 306 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
323 'msvs_disabled_warnings': [ 4267, ], 307 'msvs_disabled_warnings': [ 4267, ],
324 }, 308 },
325 { 309 {
326 'target_name': 'gpu_unittest_utils', 310 'target_name': 'gpu_unittest_utils',
327 'type': 'static_library', 311 'type': 'static_library',
328 'dependencies': [ 312 'dependencies': [
329 '../testing/gmock.gyp:gmock', 313 '../testing/gmock.gyp:gmock',
330 '../testing/gtest.gyp:gtest', 314 '../testing/gtest.gyp:gtest',
(...skipping 228 matching lines...) Expand 10 before | Expand all | Expand 10 after
559 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)', 543 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)gl_tests< (SHARED_LIB_SUFFIX)',
560 }, 544 },
561 'includes': [ 545 'includes': [
562 '../build/apk_test.gypi', 546 '../build/apk_test.gypi',
563 ], 547 ],
564 }, 548 },
565 ], 549 ],
566 }], 550 }],
567 ], 551 ],
568 } 552 }
OLDNEW
« no previous file with comments | « gpu/command_buffer_service.gypi ('k') | webkit/common/gpu/webkit_gpu.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698