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

Side by Side Diff: cc/cc_tests.gyp

Issue 981683002: cc: Add missing xdisplaycheck data dependency for tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 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
« no previous file with comments | « cc/BUILD.gn ('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) 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 'chromium_code': 1, 7 'chromium_code': 1,
8 'cc_unit_tests_source_files': [ 8 'cc_unit_tests_source_files': [
9 'animation/animation_unittest.cc', 9 'animation/animation_unittest.cc',
10 'animation/keyframed_animation_curve_unittest.cc', 10 'animation/keyframed_animation_curve_unittest.cc',
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
406 '../testing/gtest.gyp:gtest', 406 '../testing/gtest.gyp:gtest',
407 '../third_party/mesa/mesa.gyp:osmesa', 407 '../third_party/mesa/mesa.gyp:osmesa',
408 '../ui/gfx/gfx.gyp:gfx', 408 '../ui/gfx/gfx.gyp:gfx',
409 '../ui/gfx/gfx.gyp:gfx_geometry', 409 '../ui/gfx/gfx.gyp:gfx_geometry',
410 '../ui/gfx/gfx.gyp:gfx_test_support', 410 '../ui/gfx/gfx.gyp:gfx_test_support',
411 '../ui/gl/gl.gyp:gl', 411 '../ui/gl/gl.gyp:gl',
412 ], 412 ],
413 'sources': [ 413 'sources': [
414 '<@(cc_tests_support_files)', 414 '<@(cc_tests_support_files)',
415 ], 415 ],
416 'conditions': [
417 ['use_x11 == 1',
418 {
419 'dependencies': [
420 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
421 ],
422 }
423 ],
424 ],
416 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 425 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
417 'msvs_disabled_warnings': [ 4267, ], 426 'msvs_disabled_warnings': [ 4267, ],
418 }, 427 },
419 ], 428 ],
420 'conditions': [ 429 'conditions': [
421 ['OS == "android"', 430 ['OS == "android"',
422 { 431 {
423 'targets': [ 432 'targets': [
424 { 433 {
425 'target_name': 'cc_unittests_apk', 434 'target_name': 'cc_unittests_apk',
(...skipping 25 matching lines...) Expand all
451 { 460 {
452 'target_name': 'cc_unittests_run', 461 'target_name': 'cc_unittests_run',
453 'type': 'none', 462 'type': 'none',
454 'dependencies': [ 463 'dependencies': [
455 'cc_unittests', 464 'cc_unittests',
456 ], 465 ],
457 'includes': [ 466 'includes': [
458 '../build/isolate.gypi', 467 '../build/isolate.gypi',
459 ], 468 ],
460 'sources': [ 469 'sources': [
461 'cc_unittests.isolate', 470 'cc_unittests.isolate',
jamesr 2015/03/04 21:49:48 since this specifies the isolate file that chooses
462 ], 471 ],
463 }, 472 },
464 ], 473 ],
465 }], 474 }],
466 ], 475 ],
467 } 476 }
OLDNEW
« no previous file with comments | « cc/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698