Chromium Code Reviews| Index: build/all.gyp |
| =================================================================== |
| --- build/all.gyp (revision 212900) |
| +++ build/all.gyp (working copy) |
| @@ -742,14 +742,9 @@ |
| 'target_name': 'chrome_official_builder', |
| 'type': 'none', |
| 'dependencies': [ |
| - '../chrome/chrome.gyp:chromedriver', |
| '../chrome/chrome.gyp:crash_service', |
| - '../chrome/chrome.gyp:interactive_ui_tests', |
| '../chrome/chrome.gyp:policy_templates', |
| - '../chrome/chrome.gyp:reliability_tests', |
| - '../chrome/chrome.gyp:automated_ui_tests', |
| '../chrome/installer/mini_installer.gyp:mini_installer', |
| - '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| '../courgette/courgette.gyp:courgette', |
| '../cloud_print/cloud_print.gyp:cloud_print', |
| '../remoting/remoting.gyp:remoting_webapp', |
| @@ -772,6 +767,12 @@ |
| 'dependencies': [ |
| '../chrome/chrome.gyp:crash_service_win64', |
| '../courgette/courgette.gyp:courgette64', |
| + '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| + # Removing tests from Win64 to speed up cycle times. |
|
iannucci1
2013/07/22 22:31:41
s/Removing/Omitting/
jschuh
2013/07/22 23:08:02
Done.
|
| + '../chrome/chrome.gyp:interactive_ui_tests', |
| + '../chrome/chrome.gyp:reliability_tests', |
| + '../chrome/chrome.gyp:automated_ui_tests', |
| + '../chrome/chrome.gyp:chromedriver', |
|
iannucci1
2013/07/22 22:31:41
need moar indent?
Also sort? Or is order importan
jschuh
2013/07/22 23:08:02
Done.
|
| ], |
| }], |
| ['component != "shared_library" and wix_exists == "True" and \ |
| @@ -781,13 +782,6 @@ |
| ], |
| }], # component != "shared_library" |
| ['target_arch=="x64"', { |
| - 'dependencies!': [ |
| - '../chrome_frame/chrome_frame.gyp:npchrome_frame', |
| - # Temporarily removing these to speed up win64 cycle times. |
| - '../chrome/chrome.gyp:interactive_ui_tests', |
| - '../chrome/chrome.gyp:reliability_tests', |
| - '../chrome/chrome.gyp:automated_ui_tests', |
| - ], |
| 'defines': [ |
| 'OMIT_CHROME_FRAME', |
| ], |