diff options
| author | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-06 23:08:13 +0000 |
|---|---|---|
| committer | miu@chromium.org <miu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-06 23:08:13 +0000 |
| commit | 6c4008d6a0b5a83bc0b81df7f1e1d33b5f2d22d8 (patch) | |
| tree | 4cef001a0b6c1fe143274eaa5280006f20328ed9 /build/all.gyp | |
| parent | f097f0b079f252a2ae03ef9ac1c10ee6647066c7 (diff) | |
| download | chromium_src-6c4008d6a0b5a83bc0b81df7f1e1d33b5f2d22d8.zip chromium_src-6c4008d6a0b5a83bc0b81df7f1e1d33b5f2d22d8.tar.gz chromium_src-6c4008d6a0b5a83bc0b81df7f1e1d33b5f2d22d8.tar.bz2 | |
Revert 186522
> Build src/remoting/remoting.gyp:remoting_host_installation on the main waterfall.
>
> remoting_host_installation uses lots of non-trivial GYP that tend to break because of differences between ninja and msbuild. Building it on the main waterfall gives us an early warning if something goes wrong.
>
> BUG=180600
>
> Review URL: https://codereview.chromium.org/12543006
TBR=alexeypa@chromium.org
Review URL: https://codereview.chromium.org/12545010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 47 |
1 files changed, 19 insertions, 28 deletions
diff --git a/build/all.gyp b/build/all.gyp index cb84dce..dfc3811 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -248,34 +248,25 @@ '../ui/app_list/app_list.gyp:app_list_unittests', '../ui/views/views.gyp:views_unittests', '../webkit/webkit.gyp:test_shell_common', - ], - 'conditions': [ - ['target_arch!="x64"', { - 'dependencies': [ - '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', - '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', - ] - }, { # target_arch!="x64" - 'dependencies!': [ - '../chrome_frame/chrome_frame.gyp:npchrome_frame', - ], - 'defines': [ - 'OMIT_CHROME_FRAME', - ], - }], # target_arch=="x64" - # remoting_host_installation uses lots of non-trivial GYP that tend - # to break because of differences between ninja and msbuild. Make - # sure this target is built by the builders on the main waterfall. - # See http://crbug.com/180600. - ['wix_exists == "True" and sas_dll_exists == "True"', { - 'dependencies': [ - '../remoting/remoting.gyp:remoting_host_installation', - ], - }], - ], + ], + 'conditions': [ + ['target_arch!="x64"', { + 'dependencies': [ + '../chrome_frame/chrome_frame.gyp:chrome_frame_net_tests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_perftests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_reliability_tests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_tests', + '../chrome_frame/chrome_frame.gyp:chrome_frame_unittests', + ] + }, { # target_arch!="x64" + 'dependencies!': [ + '../chrome_frame/chrome_frame.gyp:npchrome_frame', + ], + 'defines': [ + 'OMIT_CHROME_FRAME', + ], + }], # target_arch=="x64" + ], }], ['OS=="linux"', { 'dependencies': [ |