| 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 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 | |
| 157 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 158 ], | 156 ], |
| 159 }], | 157 }], |
| 160 ], | 158 ], |
| 161 'dependencies': [ | 159 'dependencies': [ |
| 162 '../chrome_elf/chrome_elf.gyp:*', | 160 '../chrome_elf/chrome_elf.gyp:*', |
| 163 '../cloud_print/cloud_print.gyp:*', | 161 '../cloud_print/cloud_print.gyp:*', |
| 164 '../courgette/courgette.gyp:*', | 162 '../courgette/courgette.gyp:*', |
| 165 '../rlz/rlz.gyp:*', | 163 '../rlz/rlz.gyp:*', |
| 166 '../sandbox/sandbox.gyp:*', | 164 '../sandbox/sandbox.gyp:*', |
| 167 '<(angle_path)/src/build_angle.gyp:*', | 165 '<(angle_path)/src/build_angle.gyp:*', |
| (...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 272 }], | 270 }], |
| 273 ['OS=="win"', { | 271 ['OS=="win"', { |
| 274 'dependencies': [ | 272 'dependencies': [ |
| 275 '../chrome/chrome.gyp:crash_service', | 273 '../chrome/chrome.gyp:crash_service', |
| 276 '../chrome/chrome.gyp:installer_util_unittests', | 274 '../chrome/chrome.gyp:installer_util_unittests', |
| 277 '../chrome/chrome.gyp:mini_installer_test', | 275 '../chrome/chrome.gyp:mini_installer_test', |
| 278 # mini_installer_tests depends on mini_installer. This should be | 276 # mini_installer_tests depends on mini_installer. This should be |
| 279 # defined in installer.gyp. | 277 # defined in installer.gyp. |
| 280 '../chrome/installer/mini_installer.gyp:mini_installer', | 278 '../chrome/installer/mini_installer.gyp:mini_installer', |
| 281 '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests', | 279 '../chrome_elf/chrome_elf.gyp:chrome_elf_unittests', |
| 282 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 283 '../courgette/courgette.gyp:courgette_unittests', | 280 '../courgette/courgette.gyp:courgette_unittests', |
| 284 '../sandbox/sandbox.gyp:sbox_integration_tests', | 281 '../sandbox/sandbox.gyp:sbox_integration_tests', |
| 285 '../sandbox/sandbox.gyp:sbox_unittests', | 282 '../sandbox/sandbox.gyp:sbox_unittests', |
| 286 '../sandbox/sandbox.gyp:sbox_validation_tests', | 283 '../sandbox/sandbox.gyp:sbox_validation_tests', |
| 287 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi
n', | 284 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi
n', |
| 288 '../ui/app_list/app_list.gyp:app_list_unittests', | 285 '../ui/app_list/app_list.gyp:app_list_unittests', |
| 289 '../ui/views/views.gyp:views_unittests', | 286 '../ui/views/views.gyp:views_unittests', |
| 290 ], | 287 ], |
| 291 'conditions': [ | 288 'conditions': [ |
| 292 ['target_arch=="x64"', { | |
| 293 'dependencies!': [ | |
| 294 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 295 ], | |
| 296 'defines': [ | |
| 297 'OMIT_CHROME_FRAME', | |
| 298 ], | |
| 299 }], # target_arch=="x64" | |
| 300 # remoting_host_installation uses lots of non-trivial GYP that tend | 289 # remoting_host_installation uses lots of non-trivial GYP that tend |
| 301 # to break because of differences between ninja and msbuild. Make | 290 # to break because of differences between ninja and msbuild. Make |
| 302 # sure this target is built by the builders on the main waterfall. | 291 # sure this target is built by the builders on the main waterfall. |
| 303 # See http://crbug.com/180600. | 292 # See http://crbug.com/180600. |
| 304 ['wix_exists == "True" and sas_dll_exists == "True"', { | 293 ['wix_exists == "True" and sas_dll_exists == "True"', { |
| 305 'dependencies': [ | 294 'dependencies': [ |
| 306 '../remoting/remoting.gyp:remoting_host_installation', | 295 '../remoting/remoting.gyp:remoting_host_installation', |
| 307 ], | 296 ], |
| 308 }], | 297 }], |
| 309 ['asan==1', { | 298 ['asan==1', { |
| (...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 811 '../chrome/chrome.gyp:performance_ui_tests', | 800 '../chrome/chrome.gyp:performance_ui_tests', |
| 812 '../chrome/chrome.gyp:sync_integration_tests', | 801 '../chrome/chrome.gyp:sync_integration_tests', |
| 813 '../chrome/chrome.gyp:unit_tests', | 802 '../chrome/chrome.gyp:unit_tests', |
| 814 '../cloud_print/cloud_print.gyp:cloud_print_unittests', | 803 '../cloud_print/cloud_print.gyp:cloud_print_unittests', |
| 815 '../components/components_tests.gyp:components_unittests', | 804 '../components/components_tests.gyp:components_unittests', |
| 816 '../content/content_shell_and_tests.gyp:content_browsertests', | 805 '../content/content_shell_and_tests.gyp:content_browsertests', |
| 817 '../content/content_shell_and_tests.gyp:content_unittests', | 806 '../content/content_shell_and_tests.gyp:content_unittests', |
| 818 # mini_installer_tests depends on mini_installer. This should be | 807 # mini_installer_tests depends on mini_installer. This should be |
| 819 # defined in installer.gyp. | 808 # defined in installer.gyp. |
| 820 '../chrome/installer/mini_installer.gyp:mini_installer', | 809 '../chrome/installer/mini_installer.gyp:mini_installer', |
| 821 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 822 '../courgette/courgette.gyp:courgette_unittests', | 810 '../courgette/courgette.gyp:courgette_unittests', |
| 823 '../device/device_tests.gyp:device_unittests', | 811 '../device/device_tests.gyp:device_unittests', |
| 824 '../google_apis/gcm/gcm.gyp:gcm_unit_tests', | 812 '../google_apis/gcm/gcm.gyp:gcm_unit_tests', |
| 825 '../gpu/gpu.gyp:gpu_unittests', | 813 '../gpu/gpu.gyp:gpu_unittests', |
| 826 '../ipc/ipc.gyp:ipc_tests', | 814 '../ipc/ipc.gyp:ipc_tests', |
| 827 '../jingle/jingle.gyp:jingle_unittests', | 815 '../jingle/jingle.gyp:jingle_unittests', |
| 828 '../media/media.gyp:media_unittests', | 816 '../media/media.gyp:media_unittests', |
| 829 '../ppapi/ppapi_internal.gyp:ppapi_unittests', | 817 '../ppapi/ppapi_internal.gyp:ppapi_unittests', |
| 830 '../printing/printing.gyp:printing_unittests', | 818 '../printing/printing.gyp:printing_unittests', |
| 831 '../remoting/remoting.gyp:remoting_unittests', | 819 '../remoting/remoting.gyp:remoting_unittests', |
| 832 '../sql/sql.gyp:sql_unittests', | 820 '../sql/sql.gyp:sql_unittests', |
| 833 '../sync/sync.gyp:sync_unit_tests', | 821 '../sync/sync.gyp:sync_unit_tests', |
| 834 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid
ation_unittests', | 822 '../third_party/cacheinvalidation/cacheinvalidation.gyp:cacheinvalid
ation_unittests', |
| 835 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_
unittests', | 823 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_
unittests', |
| 836 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni
ttests', | 824 '../third_party/libphonenumber/libphonenumber.gyp:libphonenumber_uni
ttests', |
| 837 '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', | 825 '../tools/perf/clear_system_cache/clear_system_cache.gyp:*', |
| 838 '../ui/events/events.gyp:events_unittests', | 826 '../ui/events/events.gyp:events_unittests', |
| 839 '../ui/ui_unittests.gyp:ui_unittests', | 827 '../ui/ui_unittests.gyp:ui_unittests', |
| 840 '../ui/views/views.gyp:views_unittests', | 828 '../ui/views/views.gyp:views_unittests', |
| 841 '../url/url.gyp:url_unittests', | 829 '../url/url.gyp:url_unittests', |
| 842 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:webkit_compositor_bindings_unittests', | 830 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:webkit_compositor_bindings_unittests', |
| 843 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi
n', | 831 '../third_party/WebKit/public/blink_test_plugin.gyp:blink_test_plugi
n', |
| 844 ], | 832 ], |
| 845 'conditions': [ | |
| 846 ['target_arch=="x64"', { | |
| 847 'dependencies!': [ | |
| 848 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 849 ], | |
| 850 'defines': [ | |
| 851 'OMIT_CHROME_FRAME', | |
| 852 ], | |
| 853 }], # target_arch=="x64" | |
| 854 ], | |
| 855 }, | 833 }, |
| 856 { | 834 { |
| 857 'target_name': 'chromium_builder_win_cf', | 835 'target_name': 'chromium_builder_win_cf', |
| 858 'type': 'none', | 836 'type': 'none', |
| 859 'conditions': [ | |
| 860 ['target_arch!="x64"', { | |
| 861 'dependencies': [ | |
| 862 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 863 ], | |
| 864 }], # target_arch!="x64" | |
| 865 ], | |
| 866 }, | 837 }, |
| 867 { | 838 { |
| 868 'target_name': 'chromium_builder_dbg_tsan_win', | 839 'target_name': 'chromium_builder_dbg_tsan_win', |
| 869 'type': 'none', | 840 'type': 'none', |
| 870 'dependencies': [ | 841 'dependencies': [ |
| 871 '../base/base.gyp:base_unittests', | 842 '../base/base.gyp:base_unittests', |
| 872 '../cloud_print/cloud_print.gyp:cloud_print_unittests', | 843 '../cloud_print/cloud_print.gyp:cloud_print_unittests', |
| 873 '../components/components_tests.gyp:components_unittests', | 844 '../components/components_tests.gyp:components_unittests', |
| 874 '../content/content_shell_and_tests.gyp:content_unittests', | 845 '../content/content_shell_and_tests.gyp:content_unittests', |
| 875 '../crypto/crypto.gyp:crypto_unittests', | 846 '../crypto/crypto.gyp:crypto_unittests', |
| (...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 940 ], | 911 ], |
| 941 'conditions': [ | 912 'conditions': [ |
| 942 ['internal_pdf', { | 913 ['internal_pdf', { |
| 943 'dependencies': [ | 914 'dependencies': [ |
| 944 '../pdf/pdf.gyp:pdf', | 915 '../pdf/pdf.gyp:pdf', |
| 945 ], | 916 ], |
| 946 }], # internal_pdf | 917 }], # internal_pdf |
| 947 ['target_arch=="ia32"', { | 918 ['target_arch=="ia32"', { |
| 948 'dependencies': [ | 919 'dependencies': [ |
| 949 '../chrome/chrome.gyp:crash_service_win64', | 920 '../chrome/chrome.gyp:crash_service_win64', |
| 950 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 951 ], | 921 ], |
| 952 }], | 922 }], |
| 953 ['component != "shared_library" and wix_exists == "True" and \ | 923 ['component != "shared_library" and wix_exists == "True" and \ |
| 954 sas_dll_exists == "True"', { | 924 sas_dll_exists == "True"', { |
| 955 'dependencies': [ | 925 'dependencies': [ |
| 956 '../remoting/remoting.gyp:remoting_host_installation', | 926 '../remoting/remoting.gyp:remoting_host_installation', |
| 957 ], | 927 ], |
| 958 }], # component != "shared_library" | 928 }], # component != "shared_library" |
| 959 ['target_arch=="x64"', { | |
| 960 'defines': [ | |
| 961 'OMIT_CHROME_FRAME', | |
| 962 ], | |
| 963 }], # target_arch=="x64" | |
| 964 ] | 929 ] |
| 965 }, | 930 }, |
| 966 ], # targets | 931 ], # targets |
| 967 }], # branding=="Chrome" | 932 }], # branding=="Chrome" |
| 968 ], # conditions | 933 ], # conditions |
| 969 }], # OS="win" | 934 }], # OS="win" |
| 970 ['use_aura==1', { | 935 ['use_aura==1', { |
| 971 'targets': [ | 936 'targets': [ |
| 972 { | 937 { |
| 973 'target_name': 'aura_builder', | 938 'target_name': 'aura_builder', |
| (...skipping 21 matching lines...) Expand all Loading... |
| 995 '../ui/views/views.gyp:views_examples_with_content_exe', | 960 '../ui/views/views.gyp:views_examples_with_content_exe', |
| 996 '../ui/views/views.gyp:views_unittests', | 961 '../ui/views/views.gyp:views_unittests', |
| 997 '../ui/keyboard/keyboard.gyp:*', | 962 '../ui/keyboard/keyboard.gyp:*', |
| 998 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:webkit_compositor_bindings_unittests', | 963 '../webkit/renderer/compositor_bindings/compositor_bindings_tests.gy
p:webkit_compositor_bindings_unittests', |
| 999 'blink_tests', | 964 'blink_tests', |
| 1000 ], | 965 ], |
| 1001 'conditions': [ | 966 'conditions': [ |
| 1002 ['OS=="win"', { | 967 ['OS=="win"', { |
| 1003 'dependencies': [ | 968 'dependencies': [ |
| 1004 '../chrome/chrome.gyp:crash_service', | 969 '../chrome/chrome.gyp:crash_service', |
| 1005 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 1006 ], | |
| 1007 }], | |
| 1008 ['OS=="win" and target_arch=="x64"', { | |
| 1009 'dependencies!': [ | |
| 1010 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 1011 ], | |
| 1012 'defines': [ | |
| 1013 'OMIT_CHROME_FRAME', | |
| 1014 ], | 970 ], |
| 1015 }], | 971 }], |
| 1016 ['OS=="win" and target_arch=="ia32"', { | 972 ['OS=="win" and target_arch=="ia32"', { |
| 1017 'dependencies': [ | 973 'dependencies': [ |
| 1018 '../chrome/chrome.gyp:crash_service_win64', | 974 '../chrome/chrome.gyp:crash_service_win64', |
| 1019 ], | 975 ], |
| 1020 }], | 976 }], |
| 1021 ['use_ash==1', { | 977 ['use_ash==1', { |
| 1022 'dependencies': [ | 978 'dependencies': [ |
| 1023 '../ash/ash.gyp:ash_shell', | 979 '../ash/ash.gyp:ash_shell', |
| (...skipping 29 matching lines...) Expand all Loading... |
| 1053 '../chrome/chrome.gyp:interactive_ui_tests_run', | 1009 '../chrome/chrome.gyp:interactive_ui_tests_run', |
| 1054 '../chrome/chrome.gyp:sync_integration_tests_run', | 1010 '../chrome/chrome.gyp:sync_integration_tests_run', |
| 1055 '../chrome/chrome.gyp:unit_tests_run', | 1011 '../chrome/chrome.gyp:unit_tests_run', |
| 1056 '../net/net.gyp:net_unittests_run', | 1012 '../net/net.gyp:net_unittests_run', |
| 1057 ], | 1013 ], |
| 1058 }, # target_name: chromium_swarm_tests | 1014 }, # target_name: chromium_swarm_tests |
| 1059 ], | 1015 ], |
| 1060 }], | 1016 }], |
| 1061 ], # conditions | 1017 ], # conditions |
| 1062 } | 1018 } |
| OLD | NEW |