| 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 629 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 640 }, | 640 }, |
| 641 ], | 641 ], |
| 642 'dependencies': [ | 642 'dependencies': [ |
| 643 '../chrome/chrome.gyp:crash_service', | 643 '../chrome/chrome.gyp:crash_service', |
| 644 '../chrome/chrome.gyp:crash_service_win64', | 644 '../chrome/chrome.gyp:crash_service_win64', |
| 645 ], | 645 ], |
| 646 }], | 646 }], |
| 647 ['use_ash==1', { | 647 ['use_ash==1', { |
| 648 'dependencies': [ | 648 'dependencies': [ |
| 649 '../ash/ash.gyp:ash_shell', | 649 '../ash/ash.gyp:ash_shell', |
| 650 # With aura_shell_unittests as a target ash_unittests (the new |
| 651 # name) will be built as well. We need both until all build |
| 652 # bots are running ash_unittests as the test target. |
| 653 # TODO(jamescook): Switch to ash_unittests after all bots on |
| 654 # waterfall are using the new name. crbug.com/110107 |
| 650 '../ash/ash.gyp:aura_shell_unittests', | 655 '../ash/ash.gyp:aura_shell_unittests', |
| 651 ], | 656 ], |
| 652 }], | 657 }], |
| 653 ['OS=="linux"', { | 658 ['OS=="linux"', { |
| 654 # Tests that currently only work on Linux. | 659 # Tests that currently only work on Linux. |
| 655 'dependencies': [ | 660 'dependencies': [ |
| 656 '../base/base.gyp:base_unittests', | 661 '../base/base.gyp:base_unittests', |
| 657 '../content/content.gyp:content_unittests', | 662 '../content/content.gyp:content_unittests', |
| 658 '../ipc/ipc.gyp:ipc_tests', | 663 '../ipc/ipc.gyp:ipc_tests', |
| 659 '../sql/sql.gyp:sql_unittests', | 664 '../sql/sql.gyp:sql_unittests', |
| (...skipping 12 matching lines...) Expand all Loading... |
| 672 'dependencies': [ | 677 'dependencies': [ |
| 673 '../chromeos/chromeos.gyp:chromeos_unittests', | 678 '../chromeos/chromeos.gyp:chromeos_unittests', |
| 674 ], | 679 ], |
| 675 }], | 680 }], |
| 676 ], | 681 ], |
| 677 }, | 682 }, |
| 678 ], # targets | 683 ], # targets |
| 679 }], # "use_aura==1" | 684 }], # "use_aura==1" |
| 680 ], # conditions | 685 ], # conditions |
| 681 } | 686 } |
| OLD | NEW |