Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(41)

Side by Side Diff: build/all.gyp

Issue 100213009: Stop building Chrome Frame tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 ['win_use_allocator_shim==1', { 146 ['win_use_allocator_shim==1', {
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
M-A Ruel 2013/12/17 20:43:49 I think crbug.com/176875 can be marked as WontFix.
grt (UTC plus 2) 2013/12/18 04:10:48 Done.
157 '../chrome_frame/chrome_frame.gyp:*', 157 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
M-A Ruel 2013/12/17 20:43:49 What's npchrome_frame, why is it needed?
grt (UTC plus 2) 2013/12/18 04:10:48 npchrome_frame is the target for the shipping bina
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 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
281 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 281 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
282 '../courgette/courgette.gyp:courgette_unittests', 282 '../courgette/courgette.gyp:courgette_unittests',
283 '../sandbox/sandbox.gyp:sbox_integration_tests', 283 '../sandbox/sandbox.gyp:sbox_integration_tests',
284 '../sandbox/sandbox.gyp:sbox_unittests', 284 '../sandbox/sandbox.gyp:sbox_unittests',
285 '../sandbox/sandbox.gyp:sbox_validation_tests', 285 '../sandbox/sandbox.gyp:sbox_validation_tests',
286 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi n', 286 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi n',
287 '../ui/app_list/app_list.gyp:app_list_unittests', 287 '../ui/app_list/app_list.gyp:app_list_unittests',
288 '../ui/views/views.gyp:views_unittests', 288 '../ui/views/views.gyp:views_unittests',
289 ], 289 ],
290 'conditions': [ 290 'conditions': [
291 ['target_arch!="x64"', { 291 ['target_arch=="x64"', {
292 'dependencies': [
293 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
294 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
295 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests ',
296 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
297 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
298 ]
299 }, { # target_arch!="x64"
300 'dependencies!': [ 292 'dependencies!': [
301 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 293 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
302 ], 294 ],
303 'defines': [ 295 'defines': [
304 'OMIT_CHROME_FRAME', 296 'OMIT_CHROME_FRAME',
305 ], 297 ],
306 }], # target_arch=="x64" 298 }], # target_arch=="x64"
307 # remoting_host_installation uses lots of non-trivial GYP that tend 299 # remoting_host_installation uses lots of non-trivial GYP that tend
308 # to break because of differences between ninja and msbuild. Make 300 # to break because of differences between ninja and msbuild. Make
309 # sure this target is built by the builders on the main waterfall. 301 # sure this target is built by the builders on the main waterfall.
(...skipping 533 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests', 835 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni ttests',
844 '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', 836 '../tools/perf/clear_system_cache/clear_system_cache.gyp:*',
845 '../ui/events/events.gyp:events_unittests', 837 '../ui/events/events.gyp:events_unittests',
846 '../ui/ui_unittests.gyp:ui_unittests', 838 '../ui/ui_unittests.gyp:ui_unittests',
847 '../ui/views/views.gyp:views_unittests', 839 '../ui/views/views.gyp:views_unittests',
848 '../url/url.gyp:url_unittests', 840 '../url/url.gyp:url_unittests',
849 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy p:webkit_compositor_bindings_unittests', 841 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy p:webkit_compositor_bindings_unittests',
850 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi n', 842 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi n',
851 ], 843 ],
852 'conditions': [ 844 'conditions': [
853 ['target_arch!="x64"', { 845 ['target_arch=="x64"', {
854 'dependencies': [
855 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
856 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
857 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_test s',
858 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
859 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
860 ]
861 }, { # target_arch!="x64"
862 'dependencies!': [ 846 'dependencies!': [
863 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 847 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
864 ], 848 ],
865 'defines': [ 849 'defines': [
866 'OMIT_CHROME_FRAME', 850 'OMIT_CHROME_FRAME',
867 ], 851 ],
868 }], # target_arch=="x64" 852 }], # target_arch=="x64"
869 ], 853 ],
870 }, 854 },
871 { 855 {
872 'target_name': 'chromium_builder_win_cf', 856 'target_name': 'chromium_builder_win_cf',
873 'type': 'none', 857 'type': 'none',
874 'conditions': [ 858 'conditions': [
875 ['target_arch!="x64"', { 859 ['target_arch!="x64"', {
876 'dependencies': [ 860 'dependencies': [
877 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
878 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
879 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests ',
880 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
881 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
882 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 861 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
883 ], 862 ],
884 }], # target_arch!="x64" 863 }], # target_arch!="x64"
885 ], 864 ],
886 }, 865 },
887 { 866 {
888 'target_name': 'chromium_builder_dbg_tsan_win', 867 'target_name': 'chromium_builder_dbg_tsan_win',
889 'type': 'none', 868 'type': 'none',
890 'dependencies': [ 869 'dependencies': [
891 '../base/base.gyp:base_unittests', 870 '../base/base.gyp:base_unittests',
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
1020 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy p:webkit_compositor_bindings_unittests', 999 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy p:webkit_compositor_bindings_unittests',
1021 'blink_tests', 1000 'blink_tests',
1022 ], 1001 ],
1023 'conditions': [ 1002 'conditions': [
1024 ['OS=="win"', { 1003 ['OS=="win"', {
1025 'dependencies': [ 1004 'dependencies': [
1026 '../chrome/chrome.gyp:crash_service', 1005 '../chrome/chrome.gyp:crash_service',
1027 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 1006 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
1028 ], 1007 ],
1029 }], 1008 }],
1030 ['OS=="win" and target_arch!="x64"', {
1031 'dependencies': [
1032 '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests',
1033 '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests',
1034 '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests ',
1035 '../chrome_frame/chrome_frame.gyp:chrome_frame_tests',
1036 '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests',
1037 ],
1038 }],
1039 ['OS=="win" and target_arch=="x64"', { 1009 ['OS=="win" and target_arch=="x64"', {
1040 'dependencies!': [ 1010 'dependencies!': [
1041 '../chrome_frame/chrome_frame.gyp:npchrome_frame', 1011 '../chrome_frame/chrome_frame.gyp:npchrome_frame',
1042 ], 1012 ],
1043 'defines': [ 1013 'defines': [
1044 'OMIT_CHROME_FRAME', 1014 'OMIT_CHROME_FRAME',
1045 ], 1015 ],
1046 }], 1016 }],
1047 ['OS=="win" and target_arch=="ia32"', { 1017 ['OS=="win" and target_arch=="ia32"', {
1048 'dependencies': [ 1018 'dependencies': [
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
1084 '../chrome/chrome.gyp:interactive_ui_tests_run', 1054 '../chrome/chrome.gyp:interactive_ui_tests_run',
1085 '../chrome/chrome.gyp:sync_integration_tests_run', 1055 '../chrome/chrome.gyp:sync_integration_tests_run',
1086 '../chrome/chrome.gyp:unit_tests_run', 1056 '../chrome/chrome.gyp:unit_tests_run',
1087 '../net/net.gyp:net_unittests_run', 1057 '../net/net.gyp:net_unittests_run',
1088 ], 1058 ],
1089 }, # target_name: chromium_swarm_tests 1059 }, # target_name: chromium_swarm_tests
1090 ], 1060 ],
1091 }], 1061 }],
1092 ], # conditions 1062 ], # conditions
1093 } 1063 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698