| 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 558 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 569 'dependencies': [ | 569 'dependencies': [ |
| 570 '../chrome/chrome.gyp:chrome', | 570 '../chrome/chrome.gyp:chrome', |
| 571 | 571 |
| 572 # We refer to content_shell directly rather than all_webkit | 572 # We refer to content_shell directly rather than all_webkit |
| 573 # because we don't want the _unittests binaries. | 573 # because we don't want the _unittests binaries. |
| 574 '../content/content_shell_and_tests.gyp:content_shell', | 574 '../content/content_shell_and_tests.gyp:content_shell', |
| 575 ], | 575 ], |
| 576 'conditions': [ | 576 'conditions': [ |
| 577 ['OS!="win"', { | 577 ['OS!="win"', { |
| 578 'dependencies': [ | 578 'dependencies': [ |
| 579 '../content/content_shell_and_tests.gyp:content_browsertests', | |
| 580 '../net/net.gyp:dns_fuzz_stub', | 579 '../net/net.gyp:dns_fuzz_stub', |
| 581 ], | 580 ], |
| 582 }], | 581 }], |
| 583 ['OS=="win" and fastbuild==0 and target_arch=="ia32"', { | 582 ['OS=="win" and fastbuild==0 and target_arch=="ia32"', { |
| 584 'dependencies': [ | 583 'dependencies': [ |
| 585 '../chrome/chrome_syzygy.gyp:chrome_dll_syzygy', | 584 '../chrome/chrome_syzygy.gyp:chrome_dll_syzygy', |
| 586 '../content/content_shell_and_tests.gyp:content_shell_syzyasan', | 585 '../content/content_shell_and_tests.gyp:content_shell_syzyasan', |
| 587 ], | 586 ], |
| 588 'conditions': [ | 587 'conditions': [ |
| 589 ['chrome_multiple_dll==1', { | 588 ['chrome_multiple_dll==1', { |
| (...skipping 429 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1019 '../chrome/chrome.gyp:interactive_ui_tests_run', | 1018 '../chrome/chrome.gyp:interactive_ui_tests_run', |
| 1020 '../chrome/chrome.gyp:sync_integration_tests_run', | 1019 '../chrome/chrome.gyp:sync_integration_tests_run', |
| 1021 '../chrome/chrome.gyp:unit_tests_run', | 1020 '../chrome/chrome.gyp:unit_tests_run', |
| 1022 '../net/net.gyp:net_unittests_run', | 1021 '../net/net.gyp:net_unittests_run', |
| 1023 ], | 1022 ], |
| 1024 }, # target_name: chromium_swarm_tests | 1023 }, # target_name: chromium_swarm_tests |
| 1025 ], | 1024 ], |
| 1026 }], | 1025 }], |
| 1027 ], # conditions | 1026 ], # conditions |
| 1028 } | 1027 } |
| OLD | NEW |