| OLD | NEW | 
|---|
| 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   'targets': [ | 6   'targets': [ | 
| 7     { | 7     { | 
| 8       'target_name': 'All', | 8       'target_name': 'All', | 
| 9       'type': 'none', | 9       'type': 'none', | 
| 10       'xcode_create_dependents_test_runner': 1, | 10       'xcode_create_dependents_test_runner': 1, | 
| (...skipping 350 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 361       'type': 'none', | 361       'type': 'none', | 
| 362       'dependencies': [ | 362       'dependencies': [ | 
| 363         'chromium_builder_tests', | 363         'chromium_builder_tests', | 
| 364       ], | 364       ], | 
| 365     }, # target_name: chromium_2010_builder_tests | 365     }, # target_name: chromium_2010_builder_tests | 
| 366   ], | 366   ], | 
| 367   'conditions': [ | 367   'conditions': [ | 
| 368     ['OS!="ios"', { | 368     ['OS!="ios"', { | 
| 369       'targets': [ | 369       'targets': [ | 
| 370         { | 370         { | 
| 371           'target_name': 'all_webkit', | 371           'target_name': 'blink_tests', | 
| 372           'type': 'none', | 372           'type': 'none', | 
| 373           'dependencies': [ | 373           'dependencies': [ | 
| 374             '../third_party/WebKit/public/all.gyp:all_blink', | 374             '../third_party/WebKit/public/all.gyp:all_blink', | 
| 375             '../content/content_shell_and_tests.gyp:content_shell', | 375             '../content/content_shell_and_tests.gyp:content_shell', | 
| 376           ], | 376           ], | 
| 377           'conditions': [ | 377           'conditions': [ | 
| 378             ['OS=="win"', { | 378             ['OS=="win"', { | 
| 379               'dependencies': [ | 379               'dependencies': [ | 
| 380                 '../content/content_shell_and_tests.gyp:content_shell_crash_serv
      ice', | 380                 '../content/content_shell_and_tests.gyp:content_shell_crash_serv
      ice', | 
| 381               ], | 381               ], | 
| 382             }, {  # OS!="win" | 382             }, {  # OS!="win" | 
| 383               'dependencies': [ | 383               'dependencies': [ | 
| 384                 '../breakpad/breakpad.gyp:dump_syms', | 384                 '../breakpad/breakpad.gyp:dump_syms', | 
| 385                 '../breakpad/breakpad.gyp:minidump_stackwalk', | 385                 '../breakpad/breakpad.gyp:minidump_stackwalk', | 
| 386               ], | 386               ], | 
| 387             }], | 387             }], | 
| 388           ], | 388           ], | 
|  | 389         }, # target_name: blink_tests | 
|  | 390         { | 
|  | 391           # TODO(jochen): Eventually remove this target after everybody and | 
|  | 392           # the bots started to use blink_tests only. | 
|  | 393           'target_name': 'all_webkit', | 
|  | 394           'type': 'none', | 
|  | 395           'dependencies': [ | 
|  | 396             'blink_tests', | 
|  | 397           ], | 
| 389         }, # target_name: all_webkit | 398         }, # target_name: all_webkit | 
| 390         { | 399         { | 
| 391           'target_name': 'chromium_builder_nacl_win_integration', | 400           'target_name': 'chromium_builder_nacl_win_integration', | 
| 392           'type': 'none', | 401           'type': 'none', | 
| 393           'dependencies': [ | 402           'dependencies': [ | 
| 394             'chromium_builder_qa', # needed for pyauto | 403             'chromium_builder_qa', # needed for pyauto | 
| 395             'chromium_builder_tests', | 404             'chromium_builder_tests', | 
| 396           ], | 405           ], | 
| 397         }, # target_name: chromium_builder_nacl_win_integration | 406         }, # target_name: chromium_builder_nacl_win_integration | 
| 398         { | 407         { | 
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 524               'dependencies': [ | 533               'dependencies': [ | 
| 525                 '../remoting/remoting.gyp:remoting_host_installation', | 534                 '../remoting/remoting.gyp:remoting_host_installation', | 
| 526               ], | 535               ], | 
| 527             }], | 536             }], | 
| 528           ], | 537           ], | 
| 529         }, # target_name: chromium_builder_qa | 538         }, # target_name: chromium_builder_qa | 
| 530         { | 539         { | 
| 531           'target_name': 'chromium_builder_perf_av', | 540           'target_name': 'chromium_builder_perf_av', | 
| 532           'type': 'none', | 541           'type': 'none', | 
| 533           'dependencies': [ | 542           'dependencies': [ | 
| 534             'all_webkit', # to run layout tests | 543             'blink_tests', # to run layout tests | 
| 535             'chromium_builder_qa',  # needed for perf pyauto tests | 544             'chromium_builder_qa',  # needed for perf pyauto tests | 
| 536           ], | 545           ], | 
| 537         },  # target_name: chromium_builder_perf_av | 546         },  # target_name: chromium_builder_perf_av | 
| 538         { | 547         { | 
| 539           # This target contains everything we need to run tests on the special | 548           # This target contains everything we need to run tests on the special | 
| 540           # device-equipped WebRTC bots. We have device-requiring tests in | 549           # device-equipped WebRTC bots. We have device-requiring tests in | 
| 541           # PyAuto, browser_tests and content_browsertests. | 550           # PyAuto, browser_tests and content_browsertests. | 
| 542           'target_name': 'chromium_builder_webrtc', | 551           'target_name': 'chromium_builder_webrtc', | 
| 543           'type': 'none', | 552           'type': 'none', | 
| 544           'dependencies': [ | 553           'dependencies': [ | 
| (...skipping 21 matching lines...) Expand all  Loading... | 
| 566             '../chrome/chrome.gyp:chromedriver_tests', | 575             '../chrome/chrome.gyp:chromedriver_tests', | 
| 567             '../chrome/chrome.gyp:chromedriver_unittests', | 576             '../chrome/chrome.gyp:chromedriver_unittests', | 
| 568           ], | 577           ], | 
| 569         },  # target_name: chromium_builder_chromedriver | 578         },  # target_name: chromium_builder_chromedriver | 
| 570         { | 579         { | 
| 571           'target_name': 'chromium_builder_asan', | 580           'target_name': 'chromium_builder_asan', | 
| 572           'type': 'none', | 581           'type': 'none', | 
| 573           'dependencies': [ | 582           'dependencies': [ | 
| 574             '../chrome/chrome.gyp:chrome', | 583             '../chrome/chrome.gyp:chrome', | 
| 575 | 584 | 
| 576             # We refer to content_shell directly rather than all_webkit | 585             # We refer to content_shell directly rather than blink_tests | 
| 577             # because we don't want the _unittests binaries. | 586             # because we don't want the _unittests binaries. | 
| 578             '../content/content_shell_and_tests.gyp:content_shell', | 587             '../content/content_shell_and_tests.gyp:content_shell', | 
| 579           ], | 588           ], | 
| 580           'conditions': [ | 589           'conditions': [ | 
| 581             ['OS!="win"', { | 590             ['OS!="win"', { | 
| 582               'dependencies': [ | 591               'dependencies': [ | 
| 583                 '../content/content_shell_and_tests.gyp:content_browsertests', | 592                 '../content/content_shell_and_tests.gyp:content_browsertests', | 
| 584                 '../net/net.gyp:dns_fuzz_stub', | 593                 '../net/net.gyp:dns_fuzz_stub', | 
| 585               ], | 594               ], | 
| 586             }], | 595             }], | 
| (...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 860             '../sql/sql.gyp:sql_unittests', | 869             '../sql/sql.gyp:sql_unittests', | 
| 861             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid
      ation_unittests', | 870             '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid
      ation_unittests', | 
| 862             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni
      ttests', | 871             '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni
      ttests', | 
| 863             '../url/url.gyp:url_unittests', | 872             '../url/url.gyp:url_unittests', | 
| 864           ], | 873           ], | 
| 865         }, | 874         }, | 
| 866         { | 875         { | 
| 867           'target_name': 'webkit_builder_win', | 876           'target_name': 'webkit_builder_win', | 
| 868           'type': 'none', | 877           'type': 'none', | 
| 869           'dependencies': [ | 878           'dependencies': [ | 
| 870             'all_webkit', | 879             'blink_tests', | 
| 871           ], | 880           ], | 
| 872         }, | 881         }, | 
| 873       ],  # targets | 882       ],  # targets | 
| 874       'conditions': [ | 883       'conditions': [ | 
| 875         ['branding=="Chrome"', { | 884         ['branding=="Chrome"', { | 
| 876           'targets': [ | 885           'targets': [ | 
| 877             { | 886             { | 
| 878               'target_name': 'chrome_official_builder', | 887               'target_name': 'chrome_official_builder', | 
| 879               'type': 'none', | 888               'type': 'none', | 
| 880               'dependencies': [ | 889               'dependencies': [ | 
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 941             '../ui/aura/aura.gyp:*', | 950             '../ui/aura/aura.gyp:*', | 
| 942             '../ui/compositor/compositor.gyp:*', | 951             '../ui/compositor/compositor.gyp:*', | 
| 943             '../ui/message_center/message_center.gyp:*', | 952             '../ui/message_center/message_center.gyp:*', | 
| 944             '../ui/ui_unittests.gyp:ui_unittests', | 953             '../ui/ui_unittests.gyp:ui_unittests', | 
| 945             '../ui/snapshot/snapshot.gyp:snapshot_unittests', | 954             '../ui/snapshot/snapshot.gyp:snapshot_unittests', | 
| 946             '../ui/views/views.gyp:views', | 955             '../ui/views/views.gyp:views', | 
| 947             '../ui/views/views.gyp:views_examples_with_content_exe', | 956             '../ui/views/views.gyp:views_examples_with_content_exe', | 
| 948             '../ui/views/views.gyp:views_unittests', | 957             '../ui/views/views.gyp:views_unittests', | 
| 949             '../ui/keyboard/keyboard.gyp:*', | 958             '../ui/keyboard/keyboard.gyp:*', | 
| 950             '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
      p:webkit_compositor_bindings_unittests', | 959             '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
      p:webkit_compositor_bindings_unittests', | 
| 951             'all_webkit', | 960             'blink_tests', | 
| 952           ], | 961           ], | 
| 953           'conditions': [ | 962           'conditions': [ | 
| 954             ['OS=="win"', { | 963             ['OS=="win"', { | 
| 955               'dependencies': [ | 964               'dependencies': [ | 
| 956                 '../chrome/chrome.gyp:crash_service', | 965                 '../chrome/chrome.gyp:crash_service', | 
| 957                 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 966                 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 
| 958               ], | 967               ], | 
| 959             }], | 968             }], | 
| 960             ['OS=="win" and target_arch!="x64"', { | 969             ['OS=="win" and target_arch!="x64"', { | 
| 961               'dependencies': [ | 970               'dependencies': [ | 
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1023             '../chrome/chrome.gyp:interactive_ui_tests_run', | 1032             '../chrome/chrome.gyp:interactive_ui_tests_run', | 
| 1024             '../chrome/chrome.gyp:sync_integration_tests_run', | 1033             '../chrome/chrome.gyp:sync_integration_tests_run', | 
| 1025             '../chrome/chrome.gyp:unit_tests_run', | 1034             '../chrome/chrome.gyp:unit_tests_run', | 
| 1026             '../net/net.gyp:net_unittests_run', | 1035             '../net/net.gyp:net_unittests_run', | 
| 1027           ], | 1036           ], | 
| 1028         }, # target_name: chromium_swarm_tests | 1037         }, # target_name: chromium_swarm_tests | 
| 1029       ], | 1038       ], | 
| 1030     }], | 1039     }], | 
| 1031   ], # conditions | 1040   ], # conditions | 
| 1032 } | 1041 } | 
| OLD | NEW | 
|---|