| Index: remoting/remoting_host.gypi
 | 
| diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
 | 
| index e818a971bc6b93e2170f4d389d1d5def6a90f173..8978ffc8009a3d06adf34600c61b0654bf331711 100644
 | 
| --- a/remoting/remoting_host.gypi
 | 
| +++ b/remoting/remoting_host.gypi
 | 
| @@ -211,6 +211,7 @@
 | 
|          },  # end of target 'remoting_host'
 | 
|  
 | 
|          {
 | 
| +          # GN version: //remoting/host/native_messaging
 | 
|            'target_name': 'remoting_native_messaging_base',
 | 
|            'type': 'static_library',
 | 
|            'variables': { 'enable_wexit_time_destructors': 1, },
 | 
| @@ -218,18 +219,12 @@
 | 
|              '../base/base.gyp:base',
 | 
|            ],
 | 
|            'sources': [
 | 
| -            'host/native_messaging/native_messaging_pipe.cc',
 | 
| -            'host/native_messaging/native_messaging_pipe.h',
 | 
| -            'host/native_messaging/native_messaging_reader.cc',
 | 
| -            'host/native_messaging/native_messaging_reader.h',
 | 
| -            'host/native_messaging/native_messaging_writer.cc',
 | 
| -            'host/native_messaging/native_messaging_writer.h',
 | 
| -            'host/native_messaging/pipe_messaging_channel.cc',
 | 
| -            'host/native_messaging/pipe_messaging_channel.h',
 | 
| +            '<@(remoting_host_native_messaging_sources)',
 | 
|            ],
 | 
|          },  # end of target 'remoting_native_messaging_base'
 | 
|  
 | 
|          {
 | 
| +          # GN version: //remoting/host/setup
 | 
|            'target_name': 'remoting_host_setup_base',
 | 
|            'type': 'static_library',
 | 
|            'variables': { 'enable_wexit_time_destructors': 1, },
 | 
| @@ -242,28 +237,7 @@
 | 
|              'VERSION=<(version_full)',
 | 
|            ],
 | 
|            'sources': [
 | 
| -            'host/setup/daemon_controller.cc',
 | 
| -            'host/setup/daemon_controller.h',
 | 
| -            'host/setup/daemon_controller_delegate_linux.cc',
 | 
| -            'host/setup/daemon_controller_delegate_linux.h',
 | 
| -            'host/setup/daemon_controller_delegate_mac.h',
 | 
| -            'host/setup/daemon_controller_delegate_mac.mm',
 | 
| -            'host/setup/daemon_controller_delegate_win.cc',
 | 
| -            'host/setup/daemon_controller_delegate_win.h',
 | 
| -            'host/setup/me2me_native_messaging_host.cc',
 | 
| -            'host/setup/me2me_native_messaging_host.h',
 | 
| -            'host/setup/oauth_client.cc',
 | 
| -            'host/setup/oauth_client.h',
 | 
| -            'host/setup/oauth_helper.cc',
 | 
| -            'host/setup/oauth_helper.h',
 | 
| -            'host/setup/pin_validator.cc',
 | 
| -            'host/setup/pin_validator.h',
 | 
| -            'host/setup/service_client.cc',
 | 
| -            'host/setup/service_client.h',
 | 
| -            'host/setup/test_util.cc',
 | 
| -            'host/setup/test_util.h',
 | 
| -            'host/setup/win/auth_code_getter.cc',
 | 
| -            'host/setup/win/auth_code_getter.h',
 | 
| +            '<@(remoting_host_setup_sources)',
 | 
|            ],
 | 
|            'conditions': [
 | 
|              ['OS=="win"', {
 | 
| 
 |