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

Side by Side Diff: cc/cc_tests.gyp

Issue 1647453002: allocator cleanup: remove dependencies on allocator from all targets (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: pure rebase Created 4 years, 10 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 | « build/all.gyp ('k') | chrome/BUILD.gn » ('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 'chromium_code': 1, 7 'chromium_code': 1,
8 'cc_unit_tests_source_files': [ 8 'cc_unit_tests_source_files': [
9 'animation/animation_host_unittest.cc', 9 'animation/animation_host_unittest.cc',
10 'animation/animation_player_unittest.cc', 10 'animation/animation_player_unittest.cc',
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
345 '<@(cc_surfaces_unit_tests_source_files)', 345 '<@(cc_surfaces_unit_tests_source_files)',
346 ], 346 ],
347 'conditions': [ 347 'conditions': [
348 ['OS == "android"', 348 ['OS == "android"',
349 { 349 {
350 'dependencies': [ 350 'dependencies': [
351 '../testing/android/native_test.gyp:native_test_native_code', 351 '../testing/android/native_test.gyp:native_test_native_code',
352 ], 352 ],
353 } 353 }
354 ], 354 ],
355 [ 'os_posix == 1 and OS != "mac" and OS != "android" and OS != "ios"',
356 {
357 'conditions': [
358 [ 'use_allocator!="none"',
359 {
360 'dependencies': [
361 '../base/allocator/allocator.gyp:allocator',
362 ],
363 }
364 ],
365 ],
366 }
367 ],
368 ], 355 ],
369 }, 356 },
370 { 357 {
371 # GN version: //cc/cc_perftests 358 # GN version: //cc/cc_perftests
372 'target_name': 'cc_perftests', 359 'target_name': 'cc_perftests',
373 'type': '<(gtest_target_type)', 360 'type': '<(gtest_target_type)',
374 'dependencies': [ 361 'dependencies': [
375 '../base/base.gyp:test_support_base', 362 '../base/base.gyp:test_support_base',
376 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 363 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
377 '../gpu/gpu.gyp:gpu', 364 '../gpu/gpu.gyp:gpu',
(...skipping 27 matching lines...) Expand all
405 'trees/occlusion_tracker_perftest.cc', 392 'trees/occlusion_tracker_perftest.cc',
406 ], 393 ],
407 'conditions': [ 394 'conditions': [
408 ['OS == "android"', 395 ['OS == "android"',
409 { 396 {
410 'dependencies': [ 397 'dependencies': [
411 '../testing/android/native_test.gyp:native_test_native_code', 398 '../testing/android/native_test.gyp:native_test_native_code',
412 ], 399 ],
413 } 400 }
414 ], 401 ],
415 # See http://crbug.com/162998#c4 for why this is needed.
416 ['OS=="linux" and use_allocator!="none"',
417 {
418 'dependencies': [
419 '../base/allocator/allocator.gyp:allocator',
420 ],
421 }
422 ],
423 ], 402 ],
424 }, 403 },
425 { 404 {
426 'target_name': 'cc_test_support', 405 'target_name': 'cc_test_support',
427 'type': 'static_library', 406 'type': 'static_library',
428 'dependencies': [ 407 'dependencies': [
429 '../base/base.gyp:base', 408 '../base/base.gyp:base',
430 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations', 409 '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic _annotations',
431 '../gpu/command_buffer/command_buffer.gyp:gles2_utils', 410 '../gpu/command_buffer/command_buffer.gyp:gles2_utils',
432 '../gpu/gpu.gyp:gles2_c_lib', 411 '../gpu/gpu.gyp:gles2_c_lib',
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 481 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
503 ], 482 ],
504 } 483 }
505 ], 484 ],
506 ], 485 ],
507 }, 486 },
508 ], 487 ],
509 }], 488 }],
510 ], 489 ],
511 } 490 }
OLDNEW
« no previous file with comments | « build/all.gyp ('k') | chrome/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698