| 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 724 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 735 ], | 735 ], |
| 736 }, | 736 }, |
| 737 ], # targets | 737 ], # targets |
| 738 'conditions': [ | 738 'conditions': [ |
| 739 ['branding=="Chrome"', { | 739 ['branding=="Chrome"', { |
| 740 'targets': [ | 740 'targets': [ |
| 741 { | 741 { |
| 742 'target_name': 'chrome_official_builder', | 742 'target_name': 'chrome_official_builder', |
| 743 'type': 'none', | 743 'type': 'none', |
| 744 'dependencies': [ | 744 'dependencies': [ |
| 745 '../chrome/chrome.gyp:chromedriver', | |
| 746 '../chrome/chrome.gyp:crash_service', | 745 '../chrome/chrome.gyp:crash_service', |
| 747 '../chrome/chrome.gyp:interactive_ui_tests', | |
| 748 '../chrome/chrome.gyp:policy_templates', | 746 '../chrome/chrome.gyp:policy_templates', |
| 749 '../chrome/chrome.gyp:reliability_tests', | |
| 750 '../chrome/chrome.gyp:automated_ui_tests', | |
| 751 '../chrome/installer/mini_installer.gyp:mini_installer', | 747 '../chrome/installer/mini_installer.gyp:mini_installer', |
| 752 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 753 '../courgette/courgette.gyp:courgette', | 748 '../courgette/courgette.gyp:courgette', |
| 754 '../cloud_print/cloud_print.gyp:cloud_print', | 749 '../cloud_print/cloud_print.gyp:cloud_print', |
| 755 '../remoting/remoting.gyp:remoting_webapp', | 750 '../remoting/remoting.gyp:remoting_webapp', |
| 756 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter
', | 751 '../third_party/widevine/cdm/widevine_cdm.gyp:widevinecdmadapter
', |
| 757 ], | 752 ], |
| 758 'conditions': [ | 753 'conditions': [ |
| 759 # If you change this condition, make sure you also change it | 754 # If you change this condition, make sure you also change it |
| 760 # in chrome_tests.gypi | 755 # in chrome_tests.gypi |
| 761 ['enable_automation==1 and (OS=="mac" or (os_posix==1 and target
_arch==python_arch))', { | 756 ['enable_automation==1 and (OS=="mac" or (os_posix==1 and target
_arch==python_arch))', { |
| 762 'dependencies': [ | 757 'dependencies': [ |
| 763 '../chrome/chrome.gyp:pyautolib', | 758 '../chrome/chrome.gyp:pyautolib', |
| 764 ], | 759 ], |
| 765 }], | 760 }], |
| 766 ['internal_pdf', { | 761 ['internal_pdf', { |
| 767 'dependencies': [ | 762 'dependencies': [ |
| 768 '../pdf/pdf.gyp:pdf', | 763 '../pdf/pdf.gyp:pdf', |
| 769 ], | 764 ], |
| 770 }], # internal_pdf | 765 }], # internal_pdf |
| 771 ['target_arch=="ia32"', { | 766 ['target_arch=="ia32"', { |
| 772 'dependencies': [ | 767 'dependencies': [ |
| 773 '../chrome/chrome.gyp:crash_service_win64', | 768 '../chrome/chrome.gyp:crash_service_win64', |
| 769 '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| 774 '../courgette/courgette.gyp:courgette64', | 770 '../courgette/courgette.gyp:courgette64', |
| 771 # Omitting tests from Win64 to speed up cycle times. |
| 772 '../chrome/chrome.gyp:automated_ui_tests', |
| 773 '../chrome/chrome.gyp:chromedriver', |
| 774 '../chrome/chrome.gyp:interactive_ui_tests', |
| 775 '../chrome/chrome.gyp:reliability_tests', |
| 775 ], | 776 ], |
| 776 }], | 777 }], |
| 777 ['component != "shared_library" and wix_exists == "True" and \ | 778 ['component != "shared_library" and wix_exists == "True" and \ |
| 778 sas_dll_exists == "True"', { | 779 sas_dll_exists == "True"', { |
| 779 'dependencies': [ | 780 'dependencies': [ |
| 780 '../remoting/remoting.gyp:remoting_host_installation', | 781 '../remoting/remoting.gyp:remoting_host_installation', |
| 781 ], | 782 ], |
| 782 }], # component != "shared_library" | 783 }], # component != "shared_library" |
| 783 ['target_arch=="x64"', { | 784 ['target_arch=="x64"', { |
| 784 'dependencies!': [ | |
| 785 '../chrome_frame/chrome_frame.gyp:npchrome_frame', | |
| 786 # Temporarily removing these to speed up win64 cycle times. | |
| 787 '../chrome/chrome.gyp:interactive_ui_tests', | |
| 788 '../chrome/chrome.gyp:reliability_tests', | |
| 789 '../chrome/chrome.gyp:automated_ui_tests', | |
| 790 ], | |
| 791 'defines': [ | 785 'defines': [ |
| 792 'OMIT_CHROME_FRAME', | 786 'OMIT_CHROME_FRAME', |
| 793 ], | 787 ], |
| 794 }], # target_arch=="x64" | 788 }], # target_arch=="x64" |
| 795 ] | 789 ] |
| 796 }, | 790 }, |
| 797 ], # targets | 791 ], # targets |
| 798 }], # branding=="Chrome" | 792 }], # branding=="Chrome" |
| 799 ], # conditions | 793 ], # conditions |
| 800 }], # OS="win" | 794 }], # OS="win" |
| (...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 901 '../chrome/chrome.gyp:interactive_ui_tests_run', | 895 '../chrome/chrome.gyp:interactive_ui_tests_run', |
| 902 '../chrome/chrome.gyp:sync_integration_tests_run', | 896 '../chrome/chrome.gyp:sync_integration_tests_run', |
| 903 '../chrome/chrome.gyp:unit_tests_run', | 897 '../chrome/chrome.gyp:unit_tests_run', |
| 904 '../net/net.gyp:net_unittests_run', | 898 '../net/net.gyp:net_unittests_run', |
| 905 ], | 899 ], |
| 906 }, # target_name: chromium_swarm_tests | 900 }, # target_name: chromium_swarm_tests |
| 907 ], | 901 ], |
| 908 }], | 902 }], |
| 909 ], # conditions | 903 ], # conditions |
| 910 } | 904 } |
| OLD | NEW |