| 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 13 matching lines...) Expand all Loading... |
| 24 'temp_gyp/googleurl.gyp:*', | 24 'temp_gyp/googleurl.gyp:*', |
| 25 # Add new dependencies to the !ios section just below, not here (see | 25 # Add new dependencies to the !ios section just below, not here (see |
| 26 # the comment there). | 26 # the comment there). |
| 27 ], | 27 ], |
| 28 'conditions': [ | 28 'conditions': [ |
| 29 # TODO(ios): This is temporary; currently almost nothing builds with | 29 # TODO(ios): This is temporary; currently almost nothing builds with |
| 30 # OS=ios. Move dependencies back to the main dependencies section above | 30 # OS=ios. Move dependencies back to the main dependencies section above |
| 31 # as gyp files come online. | 31 # as gyp files come online. |
| 32 ['OS!="ios"', { | 32 ['OS!="ios"', { |
| 33 'dependencies': [ | 33 'dependencies': [ |
| 34 '../cc/cc_tests.gyp:*', |
| 34 '../chrome/chrome.gyp:*', | 35 '../chrome/chrome.gyp:*', |
| 35 '../content/content.gyp:*', | 36 '../content/content.gyp:*', |
| 36 '../gpu/gpu.gyp:*', | 37 '../gpu/gpu.gyp:*', |
| 37 '../gpu/tools/tools.gyp:*', | 38 '../gpu/tools/tools.gyp:*', |
| 38 '../ipc/ipc.gyp:*', | 39 '../ipc/ipc.gyp:*', |
| 39 '../jingle/jingle.gyp:*', | 40 '../jingle/jingle.gyp:*', |
| 40 '../media/media.gyp:*', | 41 '../media/media.gyp:*', |
| 41 '../ppapi/ppapi.gyp:*', | 42 '../ppapi/ppapi.gyp:*', |
| 42 '../ppapi/ppapi_internal.gyp:*', | 43 '../ppapi/ppapi_internal.gyp:*', |
| 43 '../printing/printing.gyp:*', | 44 '../printing/printing.gyp:*', |
| (...skipping 649 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 693 '../base/base.gyp:base_unittests_run', | 694 '../base/base.gyp:base_unittests_run', |
| 694 '../chrome/chrome.gyp:browser_tests_run', | 695 '../chrome/chrome.gyp:browser_tests_run', |
| 695 '../chrome/chrome.gyp:unit_tests_run', | 696 '../chrome/chrome.gyp:unit_tests_run', |
| 696 '../net/net.gyp:net_unittests_run', | 697 '../net/net.gyp:net_unittests_run', |
| 697 ], | 698 ], |
| 698 }, # target_name: chromium_swarm_tests | 699 }, # target_name: chromium_swarm_tests |
| 699 ], | 700 ], |
| 700 }], | 701 }], |
| 701 ], # conditions | 702 ], # conditions |
| 702 } | 703 } |
| OLD | NEW |