Revert 180433 because build\some.gyp was added to the CL by mistake.

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 217 matching lines @@
   'includes': [
     '../chrome/js_unittest_vars.gypi',
   ],
 
   'target_defaults': {
     'defines': [
     ],
     'include_dirs': [
       '..',  # Root of Chrome checkout
     ],
-    'variables': {
-      'win_debug_RuntimeChecks': '0',
-    },
     'conditions': [
       ['remoting_multi_process != 0', {
         'defines': [
           'REMOTING_MULTI_PROCESS',
         ],
       }],
     ],
   },
 
   'conditions': [
@@ skipping 199 matching lines @@
                 '../third_party/GTM/DebugUtils/GTMTypeCasting.h',
                 '../third_party/GTM/Foundation/GTMObjectSingleton.h',
                 '../third_party/GTM/GTMDefines.h',
               ],
               'include_dirs': [
                 '../third_party/GTM',
                 '../third_party/GTM/AppKit',
                 '../third_party/GTM/DebugUtils',
                 '../third_party/GTM/Foundation',
               ],
-              'link_settings': {
-                'libraries': [
-                  '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
-                  'libpam.a',
+              'link_settings': {  
+                'libraries': [  
+                  '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',  
+                  'libpam.a', 
                ],
               },
             }],
             ['OS=="win"', {
               'dependencies': [
                 '../sandbox/sandbox.gyp:sandbox',
               ],
             }],
           ],
         },  # end of target 'remoting_host'
 
         {
-          'target_name': 'remoting_me2me_host_static',
-          'type': 'static_library',
+          'target_name': 'remoting_me2me_host',
+          'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_i18n',
-            '../media/media.gyp:media',
-            '../net/net.gyp:net',
             'remoting_base',
             'remoting_breakpad',
             'remoting_host',
             'remoting_host_event_logger',
             'remoting_host_logging',
             'remoting_jingle_glue',
+            '../base/base.gyp:base',
+            '../base/base.gyp:base_i18n',
+            '../media/media.gyp:media',
+            '../net/net.gyp:net',
           ],
           'defines': [
             'VERSION=<(version_full)',
           ],
           'sources': [
             'host/config_file_watcher.cc',
             'host/config_file_watcher.h',
             'host/curtain_mode.h',
             'host/curtaining_host_observer.h',
             'host/curtaining_host_observer.cc',
             'host/curtain_mode_linux.cc',
             'host/curtain_mode_mac.cc',
             'host/curtain_mode_win.cc',
             'host/posix/signal_handler.cc',
             'host/posix/signal_handler.h',
+            'host/remoting_me2me_host.cc',
           ],
           'conditions': [
             ['os_posix != 1', {
               'sources/': [
                 ['exclude', '^host/posix/'],
               ],
             }],
+            ['OS=="mac"', {
+              'mac_bundle': 1,
+              'variables': {
+                 'host_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_ID@")',
+              },
+              'xcode_settings': {
+                'INFOPLIST_FILE': 'host/remoting_me2me_host-Info.plist',
+                'INFOPLIST_PREPROCESS': 'YES',
+                'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)" COPYRIGHT_INFO="<(copyright_info)"',
+              },
+              'mac_bundle_resources': [
+                'host/disconnect_window.xib',
+                'host/remoting_me2me_host.icns',
+                'host/remoting_me2me_host-Info.plist',
+              ],
+              'mac_bundle_resources!': [
+                'host/remoting_me2me_host-Info.plist',
+              ],
+              'conditions': [
+                ['mac_breakpad==1', {
+                  'variables': {
+                    # A real .dSYM is needed for dump_syms to operate on.
+                    'mac_real_dsym': 1,
+                  },
+                  'defines': ['MAC_BREAKPAD'],
+                  'copies': [
+                    {
+                      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
+                      'files': [
+                        '<(PRODUCT_DIR)/crash_inspector',
+                        '<(PRODUCT_DIR)/crash_report_sender.app'
+                      ],
+                    },
+                  ],
+                }],  # mac_breakpad==1
+              ],  # conditions
+            }],  # OS=mac
+            ['OS=="win"', {
+              'product_name': 'remoting_host',
+              'dependencies': [
+                'remoting_version_resources',
+              ],
+              'sources': [
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_host_me2me_version.rc',
+                'host/host_ui.rc',
+              ],
+              'link_settings': {
+                'libraries': [
+                  '-lcomctl32.lib',
+                ],
+              },
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'AdditionalOptions': [
+                    "\"/manifestdependency:type='win32' "
+                        "name='Microsoft.Windows.Common-Controls' "
+                        "version='6.0.0.0' "
+                        "processorArchitecture='*' "
+                        "publicKeyToken='6595b64144ccf1df' language='*'\"",
+                  ],
+                  'conditions': [
+                    ['buildtype == "Official" and remoting_multi_process == 0', {
+                      'AdditionalOptions': [
+                        "\"/MANIFESTUAC:level='requireAdministrator' "
+                            "uiAccess='true'\"",
+                      ],
+                    }],
+                  ],
+                  'ImportLibrary': '$(OutDir)\\lib\\remoting_host_exe.lib',
+                  'OutputFile': '$(OutDir)\\remoting_host.exe',
+                  # 2 == /SUBSYSTEM:WINDOWS
+                  'SubSystem': '2',
+                },
+              },
+            }],
           ],  # end of 'conditions'
-        },  # end of target 'remoting_me2me_host_static'
+        },  # end of target 'remoting_me2me_host'
 
         {
           'target_name': 'remoting_host_keygen',
           'type': 'executable',
           'dependencies': [
             'remoting_base',
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
             '../crypto/crypto.gyp:crypto',
           ],
@@ skipping 24 matching lines @@
             'host/setup/oauth_helper.h',
             'host/setup/pin_validator.cc',
             'host/setup/pin_validator.h',
             'host/setup/win/auth_code_getter.cc',
             'host/setup/win/auth_code_getter.h',
           ],
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
                 '../google_update/google_update.gyp:google_update',
-                'remoting_controller_idl',
+                'remoting_elevated_controller',
               ],
             }],
           ],
         },  # end of target 'remoting_host_setup_base'
 
         {
           'target_name': 'remoting_host_plugin',
           'type': 'loadable_module',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'product_extension': '<(host_plugin_extension)',
           'product_prefix': '<(host_plugin_prefix)',
           'dependencies': [
             'remoting_base',
             'remoting_host',
             'remoting_host_event_logger',
             'remoting_host_logging',
             'remoting_host_setup_base',
             'remoting_jingle_glue',
             '../net/net.gyp:net',
             '../third_party/npapi/npapi.gyp:npapi',
           ],
           'sources': [
             'base/dispatch_win.h',
-            'host/win/core_resource.h',
+            'host/host_ui_resource.h',
             'host/plugin/host_log_handler.cc',
             'host/plugin/host_log_handler.h',
             'host/plugin/host_plugin.cc',
             'host/plugin/host_plugin_utils.cc',
             'host/plugin/host_plugin_utils.h',
             'host/plugin/host_script_object.cc',
             'host/plugin/host_script_object.h',
           ],
           'conditions': [
             ['OS=="mac"', {
@@ skipping 24 matching lines @@
                 ['mac_breakpad==1', {
                   'variables': {
                     # A real .dSYM is needed for dump_syms to operate on.
                     'mac_real_dsym': 1,
                   },
                 }],
               ],  # conditions
             }],  # OS=="mac"
             [ 'OS=="win"', {
               'dependencies': [
-                'remoting_controller_idl',
+                'remoting_elevated_controller',
                 'remoting_version_resources',
               ],
               'include_dirs': [
                 '<(INTERMEDIATE_DIR)',
               ],
               'sources': [
                 '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_host_plugin_version.rc',
-                'host/win/core.rc',
+                'host/host_ui.rc',
                 'host/plugin/host_plugin.def',
               ],
             }],
           ],
         },  # end of target 'remoting_host_plugin'
 
-      ],  # end of 'targets'
-    }],  # 'enable_remoting_host==1'
-
-    ['OS!="win" and enable_remoting_host==1', {
-      'targets': [
         {
-          'target_name': 'remoting_me2me_host',
+          'target_name': 'remoting_desktop',
           'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
+          'defines': [
+            'REMOTING_MULTI_PROCESS',
+          ],
           'dependencies': [
-            '../base/base.gyp:base',
-            '../base/base.gyp:base_i18n',
-            '../media/media.gyp:media',
-            '../net/net.gyp:net',
             'remoting_base',
             'remoting_breakpad',
             'remoting_host',
-            'remoting_host_event_logger',
             'remoting_host_logging',
-            'remoting_jingle_glue',
-            'remoting_me2me_host_static',
-          ],
-          'defines': [
-            'VERSION=<(version_full)',
+            '../base/base.gyp:base',
+            '../ipc/ipc.gyp:ipc',
           ],
           'sources': [
-            'host/remoting_me2me_host.cc',
-            'host/remoting_me2me_host.h',
+            'host/desktop_process.cc',
+            'host/desktop_process.h',
+            'host/desktop_process_main.cc',
+            'host/desktop_session_agent.cc',
+            'host/desktop_session_agent.h',
+            'host/desktop_session_agent_posix.cc',
+            'host/desktop_session_agent_win.cc',
           ],
           'conditions': [
-            ['OS=="mac"', {
-              'mac_bundle': 1,
-              'variables': {
-                 'host_bundle_id': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_ID@")',
+            ['OS=="win"', {
+              'dependencies': [
+                'remoting_version_resources',
+              ],
+              'sources': [
+                'host/host_ui.rc',
+                '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_desktop_version.rc',
+              ],
+              'link_settings': {
+                'libraries': [
+                  '-lcomctl32.lib',
+                ],
               },
-              'xcode_settings': {
-                'INFOPLIST_FILE': 'host/remoting_me2me_host-Info.plist',
-                'INFOPLIST_PREPROCESS': 'YES',
-                'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)" BUNDLE_ID="<(host_bundle_id)" COPYRIGHT_INFO="<(copyright_info)"',
+              'msvs_settings': {
+                'VCLinkerTool': {
+                  'AdditionalOptions': [
+                    "\"/manifestdependency:type='win32' "
+                        "name='Microsoft.Windows.Common-Controls' "
+                        "version='6.0.0.0' "
+                        "processorArchitecture='*' "
+                        "publicKeyToken='6595b64144ccf1df' language='*'\"",
+                  ],
+                  'conditions': [
+                    ['buildtype == "Official"', {
+                      'AdditionalOptions': [
+                        "\"/MANIFESTUAC:level='requireAdministrator' "
+                            "uiAccess='true'\"",
+                      ],
+                    }],
+                  ],
+                  # 2 == /SUBSYSTEM:WINDOWS
+                  'SubSystem': '2',
+                },
               },
-              'mac_bundle_resources': [
-                'host/disconnect_window.xib',
-                'host/remoting_me2me_host.icns',
-                'host/remoting_me2me_host-Info.plist',
-              ],
-              'mac_bundle_resources!': [
-                'host/remoting_me2me_host-Info.plist',
-              ],
-              'conditions': [
-                ['mac_breakpad==1', {
-                  'variables': {
-                    # A real .dSYM is needed for dump_syms to operate on.
-                    'mac_real_dsym': 1,
-                  },
-                  'defines': ['MAC_BREAKPAD'],
-                  'copies': [
-                    {
-                      'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Resources',
-                      'files': [
-                        '<(PRODUCT_DIR)/crash_inspector',
-                        '<(PRODUCT_DIR)/crash_report_sender.app'
-                      ],
-                    },
-                  ],
-                }],  # mac_breakpad==1
-              ],  # conditions
-            }],  # OS=mac
-          ],  # end of 'conditions'
-        },  # end of target 'remoting_me2me_host'
+            }],
+          ],
+        },  # end of target 'remoting_desktop'
 
       ],  # end of 'targets'
-    }],  # 'OS!="win" and enable_remoting_host==1'
-
+    }],  # 'enable_remoting_host==1'
 
     ['OS=="linux" and chromeos==0', {
       'targets': [
         # Linux breakpad processing
         {
           'target_name': 'remoting_linux_symbols',
           'type': 'none',
           'conditions': [
             ['linux_dump_symbols==1', {
               'actions': [
@@ skipping 241 matching lines @@
         },  # end of target 'remoting_host_prefpane'
       ],  # end of 'targets'
       'conditions': [
         ['mac_breakpad==1', {
           'targets': [
             {
               'target_name': 'remoting_mac_symbols',
               'type': 'none',
               'dependencies': [
                 '../breakpad/breakpad.gyp:dump_syms',
-                'remoting_me2me_host',
+                'remoting_me2me_host',
               ],
               'actions': [
                 {
                   'action_name': 'dump_symbols',
                   'inputs': [
                     '<(DEPTH)/remoting/scripts/mac/dump_product_syms',
                     '<(PRODUCT_DIR)/dump_syms',
                     '<(PRODUCT_DIR)/remoting_me2me_host.app',
                   ],
                   'outputs': [
@@ skipping 20 matching lines @@
           'variables': { 'enable_wexit_time_destructors': 1, },
           'dependencies': [
             '../base/base.gyp:base',
             'remoting_host_logging',
           ],
           'sources': [
             'tools/breakpad_tester_win.cc',
           ],
         },  # end of target 'remoting_breakpad_tester'
         {
-          'target_name': 'remoting_controller_idl',
+          'target_name': 'remoting_elevated_controller',
           'type': 'static_library',
           'sources': [
             'host/win/elevated_controller_idl.templ',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.h',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller.idl',
             '<(SHARED_INTERMEDIATE_DIR)/remoting/host/elevated_controller_i.c',
           ],
           # This target exports a hard dependency because dependent targets may
           # include elevated_controller.h, a generated header.
           'hard_dependency': 1,
@@ skipping 19 matching lines @@
                 '<(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': 1,
             },
           ],
-        },  # end of target 'remoting_controller_idl'
+        },  # end of target 'remoting_elevated_controller'
         {
           'target_name': 'remoting_configurer',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../crypto/crypto.gyp:crypto',
             'remoting_host',
             'remoting_host_setup_base',
           ],
           'sources': [
@@ skipping 16 matching lines @@
                     "version='6.0.0.0' "
                     "processorArchitecture='*' "
                     "publicKeyToken='6595b64144ccf1df' language='*'\"",
               ],
               # 2 == /SUBSYSTEM:WINDOWS
               'SubSystem': '2',
             },
           },
         },  # end of target 'remoting_configurer'
         {
-          'target_name': 'remoting_core',
-          'type': 'shared_library',
+          'target_name': 'remoting_controller',
+          'type': 'executable',
           'variables': { 'enable_wexit_time_destructors': 1, },
           'defines' : [
             '_ATL_APARTMENT_THREADED',
             '_ATL_NO_AUTOMATIC_NAMESPACE',
             '_ATL_CSTRING_EXPLICIT_CONSTRUCTORS',
-            'HOST_IMPLEMENTATION',
             'STRICT',
             'DAEMON_CONTROLLER_CLSID="{<(daemon_controller_clsid)}"',
-            'VERSION=<(version_full)',
           ],
+          'include_dirs': [
+            '<(INTERMEDIATE_DIR)',
+          ],
+          'dependencies': [
+            '../base/base.gyp:base',
+            'remoting_breakpad',
+            'remoting_elevated_controller',
+            'remoting_host',
+            'remoting_host_logging',
+            'remoting_protocol',
+            'remoting_version_resources',
+          ],
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_controller_version.rc',
+            'host/pin_hash.cc',
+            'host/pin_hash.h',
+            'host/verify_config_window_win.cc',
+            'host/verify_config_window_win.h',
+            'host/win/elevated_controller.cc',
+            'host/win/elevated_controller.h',
+            'host/win/elevated_controller.rc',
+            'host/win/elevated_controller_module.cc',
+            'host/win/omaha.cc',
+            'host/win/omaha.h',
+          ],
+          'link_settings': {
+            'libraries': [
+              '-lcomctl32.lib',
+            ],
+          },
+          'msvs_settings': {
+            'VCLinkerTool': {
+              'AdditionalOptions': [
+                "\"/manifestdependency:type='win32' "
+                    "name='Microsoft.Windows.Common-Controls' "
+                    "version='6.0.0.0' "
+                    "processorArchitecture='*' "
+                    "publicKeyToken='6595b64144ccf1df' language='*'\"",
+              ],
+              # 2 == /SUBSYSTEM:WINDOWS
+              'SubSystem': '2',
+            },
+          },
+        },  # end of target 'remoting_controller'
+        {
+          'target_name': 'remoting_daemon',
+          'type': 'executable',
+          'variables': { 'enable_wexit_time_destructors': 1, },
           '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_host',
-            'remoting_host_event_logger',
             'remoting_host_logging',
-            'remoting_me2me_host_static',
-            'remoting_protocol',
             'remoting_version_resources',
           ],
           'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/host/remoting_host_messages.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_core_version.rc',
+            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_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',
-            'host/desktop_process.cc',
-            'host/desktop_process.h',
-            'host/desktop_process_main.cc',
-            'host/desktop_process_main.h',
             'host/desktop_session.cc',
             'host/desktop_session.h',
-            'host/desktop_session_agent.cc',
-            'host/desktop_session_agent.h',
-            'host/desktop_session_agent_posix.cc',
-            'host/desktop_session_agent_win.cc',
             'host/desktop_session_win.cc',
             'host/desktop_session_win.h',
             'host/host_exit_codes.h',
-            'host/host_export.h',
             'host/ipc_constants.cc',
             'host/ipc_constants.h',
-            'host/remoting_me2me_host.cc',
-            'host/remoting_me2me_host.h',
             'host/sas_injector.h',
             'host/sas_injector_win.cc',
-            'host/verify_config_window_win.cc',
-            'host/verify_config_window_win.h',
-            'host/win/core.cc',
-            'host/win/core.rc',
-            'host/win/core_resource.h',
-            'host/win/daemon_process_main.cc',
-            'host/win/daemon_process_main.h',
-            'host/win/elevated_controller.cc',
-            'host/win/elevated_controller.h',
-            'host/win/elevated_controller_module.cc',
-            'host/win/elevated_controller_module.h',
             'host/win/host_service.cc',
             'host/win/host_service.h',
+            'host/win/host_service.rc',
+            'host/win/host_service_resource.h',
             'host/win/omaha.cc',
             'host/win/omaha.h',
             'host/win/unprivileged_process_delegate.cc',
             'host/win/unprivileged_process_delegate.h',
             'host/win/worker_process_launcher.cc',
             'host/win/worker_process_launcher.h',
             'host/win/wts_console_monitor.h',
             'host/win/wts_console_observer.h',
             'host/win/wts_console_session_process_driver.cc',
             'host/win/wts_console_session_process_driver.h',
             'host/win/wts_session_process_delegate.cc',
             'host/win/wts_session_process_delegate.h',
             'host/worker_process_ipc_delegate.h',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'AdditionalDependencies': [
-                'comctl32.lib',
                 'wtsapi32.lib',
               ],
-            },
-          },
-        },  # end of target 'remoting_core'
-        {
-          'target_name': 'remoting_core_manifest',
-          'type': 'none',
-          'dependencies': [
-            'remoting_core',
-          ],
-          'hard_dependency': '1',
-          'actions': [
-            {
-              'action_name': 'Embedding manifest into remoting_core.dll',
-              'binary': '<(PRODUCT_DIR)/remoting_core.dll',
-              'manifest': 'host/win/remoting_core.manifest',
-              'inputs': [
-                '<(_binary)',
-                '<(_manifest)',
-              ],
-              'outputs': [
-                '<(_binary).embedded.manifest',
-              ],
-              'action': [
-                'mt',
-                '-nologo',
-                '-manifest',
-                '<(_manifest)',
-                '-outputresource:<(_binary);#2',
-                '-out:<(_binary).embedded.manifest',
-              ],
-            },
-          ],  # actions
-        },  # end of target 'remoting_core_manifest'
-        {
-          'target_name': 'remoting_controller',
-          'type': 'executable',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            'remoting_core',
-            'remoting_version_resources',
-          ],
-          'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_controller_version.rc',
-            'host/win/elevated_controller_entry_point.cc',
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'EntryPointSymbol': 'ElevatedControllerEntryPoint',
-              'IgnoreAllDefaultLibraries': 'true',
-              'SubSystem': '2', # /SUBSYSTEM:WINDOWS
-            },
-          },
-        },  # end of target 'remoting_controller'
-        {
-          'target_name': 'remoting_daemon',
-          'type': 'executable',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            'remoting_core',
-            'remoting_version_resources',
-          ],
-          'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_daemon_version.rc',
-            'host/win/daemon_process_entry_point.cc',
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'EntryPointSymbol': 'DaemonProcessEntryPoint',
-              'IgnoreAllDefaultLibraries': 'true',
-              'SubSystem': '2', # /SUBSYSTEM:WINDOWS
+              # 2 == /SUBSYSTEM:WINDOWS
+              'SubSystem': '2',
             },
           },
         },  # end of target 'remoting_daemon'
-        {
-          'target_name': 'remoting_desktop',
-          'type': 'executable',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            'remoting_core',
-            'remoting_version_resources',
-          ],
-          'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_desktop_version.rc',
-            'host/win/desktop_process_entry_point.cc',
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'EntryPointSymbol': 'DesktopProcessEntryPoint',
-              'IgnoreAllDefaultLibraries': 'true',
-              'SubSystem': '2', # /SUBSYSTEM:WINDOWS
-            },
-          },
-        },  # end of target 'remoting_desktop'
-        {
-          'target_name': 'remoting_desktop_manifest',
-          'type': 'none',
-          'dependencies': [
-            'remoting_desktop',
-          ],
-          'hard_dependency': '1',
-          'actions': [
-            {
-              'action_name': 'Embedding manifest into remoting_desktop.exe',
-              'binary': '<(PRODUCT_DIR)/remoting_desktop.exe',
-              'manifest': 'host/win/remoting_desktop.manifest',
-              'inputs': [
-                '<(_binary)',
-                '<(_manifest)',
-              ],
-              'outputs': [
-                '<(_binary).embedded.manifest',
-              ],
-              'action': [
-                'mt',
-                '-nologo',
-                '-manifest',
-                '<(_manifest)',
-                '-outputresource:<(_binary);#1',
-                '-out:<(_binary).embedded.manifest',
-              ],
-            },
-          ],  # actions
-        },  # end of target 'remoting_desktop_manifest'
-        {
-          'target_name': 'remoting_host_exe',
-          'product_name': 'remoting_host',
-          'type': 'executable',
-          'variables': { 'enable_wexit_time_destructors': 1, },
-          'dependencies': [
-            'remoting_core',
-            'remoting_version_resources',
-          ],
-          'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/remoting/remoting_host_version.rc',
-            'host/win/host_process_entry_point.cc',
-          ],
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'EntryPointSymbol': 'HostProcessEntryPoint',
-              'IgnoreAllDefaultLibraries': 'true',
-              'ImportLibrary': '$(OutDir)\\lib\\remoting_host_exe.lib',
-              'OutputFile': '$(OutDir)\\remoting_host.exe',
-              'SubSystem': '2', # /SUBSYSTEM:WINDOWS
-            },
-          },
-        },  # end of target 'remoting_host_exe'
-        {
-          'target_name': 'remoting_host_manifest',
-          'type': 'none',
-          'dependencies': [
-            'remoting_host_exe',
-          ],
-          'hard_dependency': '1',
-          'actions': [
-            {
-              'action_name': 'Embedding manifest into remoting_host.exe',
-              'binary': '<(PRODUCT_DIR)/remoting_host.exe',
-              'manifest': 'host/win/remoting_host.manifest',
-              'inputs': [
-                '<(_binary)',
-                '<(_manifest)',
-              ],
-              'outputs': [
-                '<(_binary).embedded.manifest',
-              ],
-              'action': [
-                'mt',
-                '-nologo',
-                '-manifest',
-                '<(_manifest)',
-                '-outputresource:<(_binary);#1',
-                '-out:<(_binary).embedded.manifest',
-              ],
-            },
-          ],  # actions
-        },  # end of target 'remoting_host_manifest'
 
         # Generates the version information resources for the Windows binaries.
         # The .RC files are generated from the "version.rc.version" template and
         # placed in the "<(SHARED_INTERMEDIATE_DIR)/remoting" folder.
         # The substitution strings are taken from:
         #   - build/util/LASTCHANGE - the last source code revision.
         #   - chrome/VERSION - the major, build & patch versions.
         #   - remoting/VERSION - the chromoting patch version (and overrides
         #       for chrome/VERSION).
         #   - (branding_path) - UI/localizable strings.
         #   - xxx.ver - per-binary non-localizable strings such as the binary
         #     name.
         {
           'target_name': 'remoting_version_resources',
           'type': 'none',
           'inputs': [
             '<(branding_path)',
             'version.rc.version',
             '<(DEPTH)/build/util/LASTCHANGE',
             '<(remoting_version_path)',
             '<(chrome_version_path)',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(SHARED_INTERMEDIATE_DIR)/remoting',
             ],
           },
           'sources': [
             'host/plugin/remoting_host_plugin.ver',
+            'host/remoting_desktop.ver',
+            'host/remoting_host_me2me.ver',
             'host/win/remoting_controller.ver',
-            'host/win/remoting_core.ver',
             'host/win/remoting_daemon.ver',
-            'host/win/remoting_desktop.ver',
-            'host/win/remoting_host.ver',
           ],
           'rules': [
             {
               'rule_name': 'version',
               'extension': 'ver',
               'variables': {
                 'lastchange_path': '<(DEPTH)/build/util/LASTCHANGE',
                 'template_input_path': 'version.rc.version',
               },
               'inputs': [
@@ skipping 66 matching lines @@
               'message': 'Generating <@(_outputs)',
             },
           ],
         },  # end of target 'remoting_host_installation'
 
         {
           'target_name': 'remoting_me2me_host_archive',
           'type': 'none',
           'dependencies': [
             'remoting_controller',
-            'remoting_core_manifest',
             'remoting_daemon',
-            'remoting_host_exe',
+            'remoting_me2me_host',
           ],
           'compiled_inputs': [
             '<(PRODUCT_DIR)/remoting_controller.exe',
-            '<(PRODUCT_DIR)/remoting_core.dll',
             '<(PRODUCT_DIR)/remoting_daemon.exe',
             '<(PRODUCT_DIR)/remoting_host.exe',
           ],
           'compiled_inputs_dst': [
             'files/remoting_controller.exe',
-            'files/remoting_core.dll',
             'files/remoting_daemon.exe',
             'files/remoting_host.exe',
           ],
           'conditions': [
             ['buildtype == "Official"', {
               'defs': [
                 'OFFICIAL_BUILD=1',
               ],
             }, {  # else buildtype != "Official"
               'defs': [
                 'OFFICIAL_BUILD=0',
               ],
             }],
-            # Add 'level="requireAdministrator" uiAccess="true"' to the manifest
-            # only for the official builds because it requires the binary to be
-            # signed to work.
-            ['buildtype == "Official" and remoting_multi_process == 0', {
-              'dependencies': [
-                'remoting_host_manifest',
-              ],
-            }],
-            ['buildtype == "Official" and remoting_multi_process != 0', {
-              'dependencies': [
-                'remoting_desktop_manifest',
-              ],
-            }],
             ['remoting_multi_process != 0', {
               'dependencies': [
                 'remoting_desktop',
               ],
               'compiled_inputs': [
                 '<(PRODUCT_DIR)/remoting_desktop.exe',
               ],
               'compiled_inputs_dst': [
                 'files/remoting_desktop.exe',
               ],
@@ skipping 875 matching lines @@
                   '../base/allocator/allocator.gyp:allocator',
                 ],
               },
             ],
           ],
         }],  # end of 'toolkit_uses_gtk == 1'
       ],  # end of 'conditions'
     },  # end of target 'remoting_unittests'
   ],  # end of targets
 }