Revert 185132

remoting/remoting.gyp

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # TODO(dmaclach): can we pick this up some other way? Right now it's
     # duplicated from chrome.gyp
     'chromium_code': 1,
 
@@ skipping 1143 matching lines @@
               ],
               'action': [
                 'python',
                 '<(version_py_path)',
                 '-e', 'DAEMON_CONTROLLER_CLSID="<(daemon_controller_clsid)"',
                 '<(RULE_INPUT_PATH)',
                 '<@(_outputs)',
               ],
               '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',
           'defines': [
             '_ATL_NO_EXCEPTIONS',
           ],
           'dependencies': [
             '../base/base.gyp:base',
             '../crypto/crypto.gyp:crypto',
             'remoting_host',
@@ skipping 99 matching lines @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_static',
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../ipc/ipc.gyp:ipc',
             '../media/media.gyp:media',
             '../net/net.gyp:net',
             'remoting_base',
             'remoting_breakpad',
             'remoting_controller_idl',
-            'remoting_controller_rc',
             'remoting_host',
             'remoting_host_event_logger',
             'remoting_host_logging',
             'remoting_me2me_host_static',
             'remoting_protocol',
             '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',
             'host/chromoting_messages.cc',
             'host/chromoting_messages.h',
             'host/config_file_watcher.cc',
             'host/config_file_watcher.h',
             'host/daemon_process.cc',
             'host/daemon_process.h',
             'host/daemon_process_win.cc',
@@ skipping 1263 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }