| 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 703 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 714 '../ui/message_center/message_center.gyp:*', | 714 '../ui/message_center/message_center.gyp:*', |
| 715 '../ui/ui.gyp:ui_unittests', | 715 '../ui/ui.gyp:ui_unittests', |
| 716 '../ui/views/views.gyp:views', | 716 '../ui/views/views.gyp:views', |
| 717 '../ui/views/views.gyp:views_examples_with_content_exe', | 717 '../ui/views/views.gyp:views_examples_with_content_exe', |
| 718 '../ui/views/views.gyp:views_unittests', | 718 '../ui/views/views.gyp:views_unittests', |
| 719 '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_
compositor_bindings_unittests', | 719 '../webkit/compositor_bindings/compositor_bindings_tests.gyp:webkit_
compositor_bindings_unittests', |
| 720 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', | 720 '../webkit/webkit.gyp:pull_in_webkit_unit_tests', |
| 721 ], | 721 ], |
| 722 'conditions': [ | 722 'conditions': [ |
| 723 ['OS=="win"', { | 723 ['OS=="win"', { |
| 724 # Remove this when we have the real compositor. | |
| 725 'copies': [ | |
| 726 { | |
| 727 'destination': '<(PRODUCT_DIR)', | |
| 728 'files': ['../third_party/directxsdk/files/dlls/D3DX10d_43.dll
'] | |
| 729 }, | |
| 730 ], | |
| 731 'dependencies': [ | 724 'dependencies': [ |
| 732 '../chrome/chrome.gyp:crash_service', | 725 '../chrome/chrome.gyp:crash_service', |
| 733 '../chrome/chrome.gyp:crash_service_win64', | 726 '../chrome/chrome.gyp:crash_service_win64', |
| 734 ], | 727 ], |
| 735 }], | 728 }], |
| 736 ['use_ash==1', { | 729 ['use_ash==1', { |
| 737 'dependencies': [ | 730 'dependencies': [ |
| 738 '../ash/ash.gyp:ash_shell', | 731 '../ash/ash.gyp:ash_shell', |
| 739 '../ash/ash.gyp:ash_unittests', | 732 '../ash/ash.gyp:ash_unittests', |
| 740 ], | 733 ], |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 776 '../chrome/chrome.gyp:browser_tests_run', | 769 '../chrome/chrome.gyp:browser_tests_run', |
| 777 '../chrome/chrome.gyp:sync_integration_tests_run', | 770 '../chrome/chrome.gyp:sync_integration_tests_run', |
| 778 '../chrome/chrome.gyp:unit_tests_run', | 771 '../chrome/chrome.gyp:unit_tests_run', |
| 779 '../net/net.gyp:net_unittests_run', | 772 '../net/net.gyp:net_unittests_run', |
| 780 ], | 773 ], |
| 781 }, # target_name: chromium_swarm_tests | 774 }, # target_name: chromium_swarm_tests |
| 782 ], | 775 ], |
| 783 }], | 776 }], |
| 784 ], # conditions | 777 ], # conditions |
| 785 } | 778 } |
| OLD | NEW |