| 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 428 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 439 '../ui/views/views.gyp:views_unittests', | 439 '../ui/views/views.gyp:views_unittests', |
| 440 # TODO(nsylvain) ui_tests.exe depends on test_shell_common. | 440 # TODO(nsylvain) ui_tests.exe depends on test_shell_common. |
| 441 # This should: | 441 # This should: |
| 442 # 1) not be the case. OR. | 442 # 1) not be the case. OR. |
| 443 # 2) be expressed in the ui tests dependencies. | 443 # 2) be expressed in the ui tests dependencies. |
| 444 '../webkit/webkit.gyp:test_shell_common', | 444 '../webkit/webkit.gyp:test_shell_common', |
| 445 'temp_gyp/googleurl.gyp:googleurl_unittests', | 445 'temp_gyp/googleurl.gyp:googleurl_unittests', |
| 446 ], | 446 ], |
| 447 }, | 447 }, |
| 448 { | 448 { |
| 449 'target_name': 'chromium_builder_win_cf', |
| 450 'type': 'none', |
| 451 'dependencies': [ |
| 452 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', |
| 453 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', |
| 454 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', |
| 455 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', |
| 456 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', |
| 457 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 458 ], |
| 459 }, |
| 460 { |
| 449 'target_name': 'chromium_builder_dbg_tsan_win', | 461 'target_name': 'chromium_builder_dbg_tsan_win', |
| 450 'type': 'none', | 462 'type': 'none', |
| 451 'dependencies': [ | 463 'dependencies': [ |
| 452 '../base/base.gyp:base_unittests', | 464 '../base/base.gyp:base_unittests', |
| 453 '../content/content.gyp:content_unittests', | 465 '../content/content.gyp:content_unittests', |
| 454 '../crypto/crypto.gyp:crypto_unittests', | 466 '../crypto/crypto.gyp:crypto_unittests', |
| 455 '../ipc/ipc.gyp:ipc_tests', | 467 '../ipc/ipc.gyp:ipc_tests', |
| 456 '../jingle/jingle.gyp:jingle_unittests', | 468 '../jingle/jingle.gyp:jingle_unittests', |
| 457 '../media/media.gyp:media_unittests', | 469 '../media/media.gyp:media_unittests', |
| 458 '../net/net.gyp:net_unittests', | 470 '../net/net.gyp:net_unittests', |
| (...skipping 163 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 622 '../chrome/chrome.gyp:ui_tests', | 634 '../chrome/chrome.gyp:ui_tests', |
| 623 '../ui/views/views.gyp:views_unittests', | 635 '../ui/views/views.gyp:views_unittests', |
| 624 ], | 636 ], |
| 625 }], | 637 }], |
| 626 ], | 638 ], |
| 627 }, | 639 }, |
| 628 ], # targets | 640 ], # targets |
| 629 }], # "use_aura==1" | 641 }], # "use_aura==1" |
| 630 ], # conditions | 642 ], # conditions |
| 631 } | 643 } |
| OLD | NEW |