diff options
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 80 |
1 files changed, 47 insertions, 33 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index 4835be6..0284b35 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -529,6 +529,23 @@ }, # end of target 'remoting_host' { + 'target_name': 'remoting_native_messaging_base', + 'type': 'static_library', + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'dependencies': [ + '../base/base.gyp:base', + ], + 'sources': [ + 'host/native_messaging/native_messaging_channel.cc', + 'host/native_messaging/native_messaging_channel.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', + ], + }, # end of target 'remoting_native_messaging_base' + + { 'target_name': 'remoting_me2me_host_static', 'type': 'static_library', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -589,14 +606,8 @@ 'host/setup/daemon_installer_win.h', 'host/setup/host_starter.cc', 'host/setup/host_starter.h', - 'host/setup/native_messaging_channel.cc', - 'host/setup/native_messaging_channel.h', - 'host/setup/native_messaging_host.cc', - 'host/setup/native_messaging_host.h', - 'host/setup/native_messaging_reader.cc', - 'host/setup/native_messaging_reader.h', - 'host/setup/native_messaging_writer.cc', - 'host/setup/native_messaging_writer.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', @@ -748,8 +759,8 @@ 'remoting_resources', ], 'sources': [ - 'host/it2me/it2me_impl.cc', - 'host/it2me/it2me_impl.h', + 'host/it2me/it2me_host.cc', + 'host/it2me/it2me_host.h', ], }, # end of target 'remoting_it2me_host_static' { @@ -899,7 +910,8 @@ 'dependencies': [ 'remoting_me2me_host', 'remoting_start_host', - 'remoting_native_messaging_host', + 'remoting_me2me_native_messaging_host', + 'remoting_me2me_native_messaging_manifest', ], 'actions': [ { @@ -1021,7 +1033,7 @@ ], # end of 'conditions' }, # end of target 'remoting_me2me_host' { - 'target_name': 'remoting_native_messaging_host', + 'target_name': 'remoting_me2me_native_messaging_host', 'type': 'executable', 'variables': { 'enable_wexit_time_destructors': 1, }, 'dependencies': [ @@ -1029,13 +1041,10 @@ 'remoting_host', 'remoting_host_logging', 'remoting_host_setup_base', - 'remoting_native_messaging_manifest', - ], - 'defines': [ - 'VERSION=<(version_full)', + 'remoting_native_messaging_base', ], 'sources': [ - 'host/setup/native_messaging_host_main.cc', + 'host/setup/me2me_native_messaging_host_main.cc', ], 'conditions': [ ['OS=="linux" and linux_use_tcmalloc==1', { @@ -1044,7 +1053,7 @@ ], }], ], - }, # end of target 'remoting_native_messaging_host' + }, # end of target 'remoting_me2me_native_messaging_host' ], # end of 'targets' }], # 'OS!="win" and enable_remoting_host==1' @@ -1158,7 +1167,8 @@ 'remoting_host_prefpane', 'remoting_host_uninstaller', 'remoting_me2me_host', - 'remoting_native_messaging_host', + 'remoting_me2me_native_messaging_host', + 'remoting_me2me_native_messaging_manifest', ], 'variables': { 'host_name': '<!(python <(version_py_path) -f <(branding_path) -t "@HOST_PLUGIN_FILE_NAME@")', @@ -1188,7 +1198,7 @@ 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app', 'Applications/<(host_uninstaller_name).app', 'PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app/Contents/MacOS/native_messaging_host', - 'Config/com.google.chrome.remote_desktop.json', + 'Config/com.google.chrome.remote_desktop.json', ], 'source_files': [ '<@(remoting_host_installer_mac_files)', @@ -1536,6 +1546,7 @@ 'remoting_lib_ps', 'remoting_lib_rc', 'remoting_me2me_host_static', + 'remoting_native_messaging_base', 'remoting_protocol', 'remoting_version_resources', ], @@ -1570,6 +1581,7 @@ 'host/remoting_me2me_host.cc', 'host/sas_injector.h', 'host/sas_injector_win.cc', + 'host/setup/me2me_native_messaging_host_main.cc', 'host/verify_config_window_win.cc', 'host/verify_config_window_win.h', 'host/win/chromoting_module.cc', @@ -1964,7 +1976,7 @@ 'remoting_core', 'remoting_desktop', 'remoting_host_exe', - 'remoting_native_messaging_manifest', + 'remoting_me2me_native_messaging_manifest', ], 'compiled_inputs': [ '<(PRODUCT_DIR)/remoting_core.dll', @@ -2321,16 +2333,16 @@ ], }, # end of target 'remoting_webapp' - # Generates 'native_messaging_manifest.json' to be included in the + # Generates 'me2me_native_messaging_manifest.json' to be included in the # installation. { - 'target_name': 'remoting_native_messaging_manifest', + 'target_name': 'remoting_me2me_native_messaging_manifest', 'type': 'none', 'dependencies': [ 'remoting_resources', ], 'variables': { - 'input': 'host/setup/native_messaging_manifest.json', + 'input': 'host/setup/me2me_native_messaging_manifest.json', 'output': '<(PRODUCT_DIR)/remoting/com.google.chrome.remote_desktop.json', }, 'target_conditions': [ @@ -2338,19 +2350,19 @@ 'conditions': [ [ 'OS == "win"', { 'variables': { - 'native_messaging_host_path': 'remoting_host.exe', + 'me2me_native_messaging_host_path': 'remoting_host.exe', }, }], [ 'OS == "mac"', { 'variables': { - 'native_messaging_host_path': '/Library/PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app/Contents/MacOS/native_messaging_host', + 'me2me_native_messaging_host_path': '/Library/PrivilegedHelperTools/org.chromium.chromoting.me2me_host.app/Contents/MacOS/native_messaging_host', }, }], ['OS == "linux"', { 'variables': { - 'native_messaging_host_path': '/opt/google/chrome-remote-desktop/native-messaging-host', + 'me2me_native_messaging_host_path': '/opt/google/chrome-remote-desktop/native-messaging-host', }, }], ['OS != "linux" and OS != "mac" and OS != "win"', { 'variables': { - 'native_messaging_host_path': '/opt/google/chrome-remote-desktop/native-messaging-host', + 'me2me_native_messaging_host_path': '/opt/google/chrome-remote-desktop/native-messaging-host', }, }], ], # conditions @@ -2367,7 +2379,7 @@ 'action': [ 'python', '<(remoting_localize_path)', - '--define', 'NATIVE_MESSAGING_HOST_PATH=<(native_messaging_host_path)', + '--define', 'ME2ME_NATIVE_MESSAGING_HOST_PATH=<(me2me_native_messaging_host_path)', '--locale_dir', '<(webapp_locale_dir)', '--template', '<(input)', '--locale_output', @@ -2380,7 +2392,7 @@ }, ], ], # target_conditions - }, # end of target 'remoting_native_messaging_manifest' + }, # end of target 'remoting_me2me_native_messaging_manifest' { 'target_name': 'remoting_resources', 'type': 'none', @@ -2787,6 +2799,7 @@ 'remoting_host_event_logger', 'remoting_host_setup_base', 'remoting_jingle_glue', + 'remoting_native_messaging_base', 'remoting_protocol', 'remoting_resources', '../third_party/webrtc/modules/modules.gyp:desktop_capture', @@ -2851,6 +2864,8 @@ 'host/linux/x_server_clipboard_unittest.cc', 'host/local_input_monitor_unittest.cc', 'host/log_to_server_unittest.cc', + 'host/native_messaging/native_messaging_reader_unittest.cc', + 'host/native_messaging/native_messaging_writer_unittest.cc', 'host/pairing_registry_delegate_linux_unittest.cc', 'host/pairing_registry_delegate_win_unittest.cc', 'host/pin_hash_unittest.cc', @@ -2866,9 +2881,7 @@ 'host/screen_capturer_fake.h', 'host/screen_resolution_unittest.cc', 'host/server_log_entry_unittest.cc', - 'host/setup/native_messaging_host_unittest.cc', - 'host/setup/native_messaging_reader_unittest.cc', - 'host/setup/native_messaging_writer_unittest.cc', + 'host/setup/me2me_native_messaging_host_unittest.cc', 'host/setup/oauth_helper_unittest.cc', 'host/setup/pin_validator_unittest.cc', 'host/token_validator_factory_impl_unittest.cc', @@ -2971,6 +2984,7 @@ 'dependencies!': [ 'remoting_host', 'remoting_host_setup_base', + 'remoting_native_messaging_base', ], 'sources/': [ ['exclude', 'codec/*'], |