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 /remoting | |
| 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 'remoting')
| -rw-r--r-- | remoting/remoting.gyp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 7597eb0..d0009f6 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -1702,12 +1702,11 @@ ], # end of 'targets' }], # 'OS=="win"' - # The host installation is generated only if WiX is available and when - # building a non-component build. WiX does not provide a easy way to - # include all DLLs imported by the installed binaries, so supporting - # the component build becomes a burden. - ['OS == "win" and component != "shared_library" and wix_exists == "True" \ - and sas_dll_exists == "True"', { + # The host installation is generated only if WiX is available. If + # component build is used the produced installation will not work due to + # missing DLLs. We build it anyway to make sure the GYP scripts are executed + # by the bots. + ['OS == "win" and wix_exists == "True" and sas_dll_exists == "True"', { 'targets': [ { 'target_name': 'remoting_host_installation', |