| 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 136 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 147 'dependencies': [ | 147 'dependencies': [ |
| 148 '../base/allocator/allocator.gyp:*', | 148 '../base/allocator/allocator.gyp:*', |
| 149 ], | 149 ], |
| 150 }], | 150 }], |
| 151 # Don't enable dependencies that don't work on Win64. | 151 # Don't enable dependencies that don't work on Win64. |
| 152 ['target_arch!="x64"', { | 152 ['target_arch!="x64"', { |
| 153 'dependencies': [ | 153 'dependencies': [ |
| 154 # TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877 | 154 # TODO(jschuh) Enable Win64 Memory Watcher. crbug.com/176877 |
| 155 '../tools/memory_watcher/memory_watcher.gyp:*', | 155 '../tools/memory_watcher/memory_watcher.gyp:*', |
| 156 # TODO(jschuh) Enable Win64 Chrome Frame. crbug.com/176875 | 156 # TODO(jschuh) Enable Win64 Chrome Frame. crbug.com/176875 |
| 157 '../chrome_frame/chrome_frame.gyp:*', | 157 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 158 ], | 158 ], |
| 159 }], | 159 }], |
| 160 ], | 160 ], |
| 161 'dependencies': [ | 161 'dependencies': [ |
| 162 '../chrome_elf/chrome_elf.gyp:*', | 162 '../chrome_elf/chrome_elf.gyp:*', |
| 163 '../cloud_print/cloud_print.gyp:*', | 163 '../cloud_print/cloud_print.gyp:*', |
| 164 '../courgette/courgette.gyp:*', | 164 '../courgette/courgette.gyp:*', |
| 165 '../rlz/rlz.gyp:*', | 165 '../rlz/rlz.gyp:*', |
| 166 '../sandbox/sandbox.gyp:*', | 166 '../sandbox/sandbox.gyp:*', |
| 167 '<(angle_path)/src/build_angle.gyp:*', | 167 '<(angle_path)/src/build_angle.gyp:*', |
| (...skipping 114 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 282 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 282 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 283 '../courgette/courgette.gyp:courgette_unittests', | 283 '../courgette/courgette.gyp:courgette_unittests', |
| 284 '../sandbox/sandbox.gyp:sbox_integration_tests', | 284 '../sandbox/sandbox.gyp:sbox_integration_tests', |
| 285 '../sandbox/sandbox.gyp:sbox_unittests', | 285 '../sandbox/sandbox.gyp:sbox_unittests', |
| 286 '../sandbox/sandbox.gyp:sbox_validation_tests', | 286 '../sandbox/sandbox.gyp:sbox_validation_tests', |
| 287 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi
n', | 287 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi
n', |
| 288 '../ui/app_list/app_list.gyp:app_list_unittests', | 288 '../ui/app_list/app_list.gyp:app_list_unittests', |
| 289 '../ui/views/views.gyp:views_unittests', | 289 '../ui/views/views.gyp:views_unittests', |
| 290 ], | 290 ], |
| 291 'conditions': [ | 291 'conditions': [ |
| 292 ['target_arch!="x64"', { | 292 ['target_arch=="x64"', { |
| 293 'dependencies': [ | |
| 294 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', | |
| 295 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', | |
| 296 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests
', | |
| 297 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', | |
| 298 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', | |
| 299 ] | |
| 300 }, { # target_arch!="x64" | |
| 301 'dependencies!': [ | 293 'dependencies!': [ |
| 302 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 294 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 303 ], | 295 ], |
| 304 'defines': [ | 296 'defines': [ |
| 305 'OMIT_CHROME_FRAME', | 297 'OMIT_CHROME_FRAME', |
| 306 ], | 298 ], |
| 307 }], # target_arch=="x64" | 299 }], # target_arch=="x64" |
| 308 # remoting_host_installation uses lots of non-trivial GYP that tend | 300 # remoting_host_installation uses lots of non-trivial GYP that tend |
| 309 # to break because of differences between ninja and msbuild. Make | 301 # to break because of differences between ninja and msbuild. Make |
| 310 # sure this target is built by the builders on the main waterfall. | 302 # sure this target is built by the builders on the main waterfall. |
| (...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 844 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni
ttests', | 836 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni
ttests', |
| 845 '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', | 837 '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', |
| 846 '../ui/events/events.gyp:events_unittests', | 838 '../ui/events/events.gyp:events_unittests', |
| 847 '../ui/ui_unittests.gyp:ui_unittests', | 839 '../ui/ui_unittests.gyp:ui_unittests', |
| 848 '../ui/views/views.gyp:views_unittests', | 840 '../ui/views/views.gyp:views_unittests', |
| 849 '../url/url.gyp:url_unittests', | 841 '../url/url.gyp:url_unittests', |
| 850 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:webkit_compositor_bindings_unittests', | 842 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:webkit_compositor_bindings_unittests', |
| 851 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi
n', | 843 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi
n', |
| 852 ], | 844 ], |
| 853 'conditions': [ | 845 'conditions': [ |
| 854 ['target_arch!="x64"', { | 846 ['target_arch=="x64"', { |
| 855 'dependencies': [ | |
| 856 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', | |
| 857 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', | |
| 858 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_test
s', | |
| 859 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', | |
| 860 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', | |
| 861 ] | |
| 862 }, { # target_arch!="x64" | |
| 863 'dependencies!': [ | 847 'dependencies!': [ |
| 864 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 848 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 865 ], | 849 ], |
| 866 'defines': [ | 850 'defines': [ |
| 867 'OMIT_CHROME_FRAME', | 851 'OMIT_CHROME_FRAME', |
| 868 ], | 852 ], |
| 869 }], # target_arch=="x64" | 853 }], # target_arch=="x64" |
| 870 ], | 854 ], |
| 871 }, | 855 }, |
| 872 { | 856 { |
| 873 'target_name': 'chromium_builder_win_cf', | 857 'target_name': 'chromium_builder_win_cf', |
| 874 'type': 'none', | 858 'type': 'none', |
| 875 'conditions': [ | 859 'conditions': [ |
| 876 ['target_arch!="x64"', { | 860 ['target_arch!="x64"', { |
| 877 'dependencies': [ | 861 'dependencies': [ |
| 878 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', | |
| 879 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', | |
| 880 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests
', | |
| 881 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', | |
| 882 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', | |
| 883 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 862 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 884 ], | 863 ], |
| 885 }], # target_arch!="x64" | 864 }], # target_arch!="x64" |
| 886 ], | 865 ], |
| 887 }, | 866 }, |
| 888 { | 867 { |
| 889 'target_name': 'chromium_builder_dbg_tsan_win', | 868 'target_name': 'chromium_builder_dbg_tsan_win', |
| 890 'type': 'none', | 869 'type': 'none', |
| 891 'dependencies': [ | 870 'dependencies': [ |
| 892 '../base/base.gyp:base_unittests', | 871 '../base/base.gyp:base_unittests', |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1019 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:webkit_compositor_bindings_unittests', | 998 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:webkit_compositor_bindings_unittests', |
| 1020 'blink_tests', | 999 'blink_tests', |
| 1021 ], | 1000 ], |
| 1022 'conditions': [ | 1001 'conditions': [ |
| 1023 ['OS=="win"', { | 1002 ['OS=="win"', { |
| 1024 'dependencies': [ | 1003 'dependencies': [ |
| 1025 '../chrome/chrome.gyp:crash_service', | 1004 '../chrome/chrome.gyp:crash_service', |
| 1026 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 1005 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 1027 ], | 1006 ], |
| 1028 }], | 1007 }], |
| 1029 ['OS=="win" and target_arch!="x64"', { | |
| 1030 'dependencies': [ | |
| 1031 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', | |
| 1032 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', | |
| 1033 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests
', | |
| 1034 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', | |
| 1035 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', | |
| 1036 ], | |
| 1037 }], | |
| 1038 ['OS=="win" and target_arch=="x64"', { | 1008 ['OS=="win" and target_arch=="x64"', { |
| 1039 'dependencies!': [ | 1009 'dependencies!': [ |
| 1040 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | 1010 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 1041 ], | 1011 ], |
| 1042 'defines': [ | 1012 'defines': [ |
| 1043 'OMIT_CHROME_FRAME', | 1013 'OMIT_CHROME_FRAME', |
| 1044 ], | 1014 ], |
| 1045 }], | 1015 }], |
| 1046 ['OS=="win" and target_arch=="ia32"', { | 1016 ['OS=="win" and target_arch=="ia32"', { |
| 1047 'dependencies': [ | 1017 'dependencies': [ |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1083 '../chrome/chrome.gyp:interactive_ui_tests_run', | 1053 '../chrome/chrome.gyp:interactive_ui_tests_run', |
| 1084 '../chrome/chrome.gyp:sync_integration_tests_run', | 1054 '../chrome/chrome.gyp:sync_integration_tests_run', |
| 1085 '../chrome/chrome.gyp:unit_tests_run', | 1055 '../chrome/chrome.gyp:unit_tests_run', |
| 1086 '../net/net.gyp:net_unittests_run', | 1056 '../net/net.gyp:net_unittests_run', |
| 1087 ], | 1057 ], |
| 1088 }, # target_name: chromium_swarm_tests | 1058 }, # target_name: chromium_swarm_tests |
| 1089 ], | 1059 ], |
| 1090 }], | 1060 }], |
| 1091 ], # conditions | 1061 ], # conditions |
| 1092 } | 1062 } |
| OLD | NEW |