diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 07:00:20 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-02-28 07:00:20 +0000 |
| commit | cd9d33de033d1976bcbe7955390af143efcf5eb9 (patch) | |
| tree | fddaf55f33385d84eec724106f2c6786934bde5b /remoting/remoting.gyp | |
| parent | 33c797bc9ed66302ca00eaf0eed00ab84ba13456 (diff) | |
| download | chromium_src-cd9d33de033d1976bcbe7955390af143efcf5eb9.zip chromium_src-cd9d33de033d1976bcbe7955390af143efcf5eb9.tar.gz chromium_src-cd9d33de033d1976bcbe7955390af143efcf5eb9.tar.bz2 | |
Revert 185132
> Make sure .RC file including elevated_controller.tlb is rebuilt every time .TLB is updated.
>
> Also cleaned up an unnecessary use of Cygwin while generating elevated_controller.idl.
>
> BUG=178633
>
> Review URL: https://chromiumcodereview.appspot.com/12315122
TBR=alexeypa@chromium.org
Review URL: https://codereview.chromium.org/12382010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@185171 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 38 |
1 files changed, 1 insertions, 37 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index d6baa72..cdb3ca9 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -1161,44 +1161,10 @@ ], 'process_outputs_as_sources': 1, 'message': 'Generating <@(_outputs)', - 'msvs_cygwin_shell': 0, + 'msvs_cygwin_shell': 1, }, ], }, # end of target 'remoting_controller_idl' - - # Regenerates 'elevated_controller.rc' (used to embed - # 'elevated_controller.tlb' into remoting_core.dll's resources) every - # time 'elevated_controller_idl.templ' changes. Making remoting_core - # depend on both this and 'remoting_controller_idl' targets ensures that - # the resorces are rebuilt every time the type library is updated. GYP - # alone is not smart enough to figure out this dependency on its own. - { - 'target_name': 'remoting_controller_rc', - 'type': 'none', - 'sources': [ - 'host/win/elevated_controller_idl.templ', - ], - 'hard_dependency': 1, - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - 'rules': [ - { - 'rule_name': 'generate_rc', - 'extension': 'templ', - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.rc', - ], - 'action': [ - 'echo 1 typelib "remoting/host/elevated_controller.tlb" > <@(_outputs)', - ], - 'message': 'Generating <@(_outputs)', - 'msvs_cygwin_shell': 0, - }, - ], - }, # end of target 'remoting_controller_rc' { 'target_name': 'remoting_configurer', 'type': 'executable', @@ -1318,7 +1284,6 @@ 'remoting_base', 'remoting_breakpad', 'remoting_controller_idl', - 'remoting_controller_rc', 'remoting_host', 'remoting_host_event_logger', 'remoting_host_logging', @@ -1327,7 +1292,6 @@ 'remoting_version_resources', ], 'sources': [ - '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.rc', '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc', '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_core_version.rc', 'base/scoped_sc_handle_win.h', |