diff options
| author | alexeypa@google.com <alexeypa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 00:11:28 +0000 |
|---|---|---|
| committer | alexeypa@google.com <alexeypa@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 00:11:28 +0000 |
| commit | 0b980ef4ec51d05645723f802f2b5945f65c8fc7 (patch) | |
| tree | 208903f17a3143b04eb29fbba69cd398594d38cc /build/all.gyp | |
| parent | 47e932da0ff754c09639247651c164701da3dfe0 (diff) | |
| download | chromium_src-0b980ef4ec51d05645723f802f2b5945f65c8fc7.zip chromium_src-0b980ef4ec51d05645723f802f2b5945f65c8fc7.tar.gz chromium_src-0b980ef4ec51d05645723f802f2b5945f65c8fc7.tar.bz2 | |
Revert 186526
The LNK1104 error was probably a flake. The next build cycled green before the 1st revert was picked up.
> 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
TBR=miu@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/all.gyp')
| -rw-r--r-- | build/all.gyp | 47 |
1 files changed, 28 insertions, 19 deletions
diff --git a/build/all.gyp b/build/all.gyp index dfc3811..cb84dce 100644 --- a/build/all.gyp +++ b/build/all.gyp @@ -248,25 +248,34 @@ '../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" - ], + ], + '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', + ], + }], + ], }], ['OS=="linux"', { 'dependencies': [ |