diff options
| -rw-r--r-- | build/all.gyp | 47 | ||||
| -rw-r--r-- | remoting/remoting.gyp | 11 |
2 files changed, 25 insertions, 33 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': [ diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index d0009f6..7597eb0 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -1702,11 +1702,12 @@ ], # end of 'targets' }], # 'OS=="win"' - # 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"', { + # 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"', { 'targets': [ { 'target_name': 'remoting_host_installation', |