| 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 574 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 585 { | 585 { |
| 586 'target_name': 'webkit_builder_win', | 586 'target_name': 'webkit_builder_win', |
| 587 'type': 'none', | 587 'type': 'none', |
| 588 'dependencies': [ | 588 'dependencies': [ |
| 589 '../webkit/webkit.gyp:test_shell', | 589 '../webkit/webkit.gyp:test_shell', |
| 590 '../webkit/webkit.gyp:test_shell_tests', | 590 '../webkit/webkit.gyp:test_shell_tests', |
| 591 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', | 591 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', |
| 592 '../webkit/webkit.gyp:pull_in_DumpRenderTree', | 592 '../webkit/webkit.gyp:pull_in_DumpRenderTree', |
| 593 ], | 593 ], |
| 594 }, | 594 }, |
| 595 { | |
| 596 'target_name': 'chromium_builder_qa_nacl_win64', | |
| 597 'type': 'none', | |
| 598 'dependencies': [ | |
| 599 'chromium_builder_qa', # needed for pyauto | |
| 600 '../chrome/chrome.gyp:chrome_nacl_win64', | |
| 601 ], | |
| 602 }, # target_name: chromium_builder_qa_nacl_win64 | |
| 603 ], # targets | 595 ], # targets |
| 604 'conditions': [ | 596 'conditions': [ |
| 605 ['branding=="Chrome"', { | 597 ['branding=="Chrome"', { |
| 606 'targets': [ | 598 'targets': [ |
| 607 { | 599 { |
| 608 'target_name': 'chrome_official_builder', | 600 'target_name': 'chrome_official_builder', |
| 609 'type': 'none', | 601 'type': 'none', |
| 610 'dependencies': [ | 602 'dependencies': [ |
| 611 '../chrome/chrome.gyp:chromedriver', | 603 '../chrome/chrome.gyp:chromedriver', |
| 612 '../chrome/chrome.gyp:chromedriver2', | 604 '../chrome/chrome.gyp:chromedriver2', |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 727 '../chrome/chrome.gyp:browser_tests_run', | 719 '../chrome/chrome.gyp:browser_tests_run', |
| 728 '../chrome/chrome.gyp:sync_integration_tests_run', | 720 '../chrome/chrome.gyp:sync_integration_tests_run', |
| 729 '../chrome/chrome.gyp:unit_tests_run', | 721 '../chrome/chrome.gyp:unit_tests_run', |
| 730 '../net/net.gyp:net_unittests_run', | 722 '../net/net.gyp:net_unittests_run', |
| 731 ], | 723 ], |
| 732 }, # target_name: chromium_swarm_tests | 724 }, # target_name: chromium_swarm_tests |
| 733 ], | 725 ], |
| 734 }], | 726 }], |
| 735 ], # conditions | 727 ], # conditions |
| 736 } | 728 } |
| OLD | NEW |