{
'target_name': 'remoting_host',
'type': 'static_library',
- 'variables': { 'enable_wexit_time_destructors': 1, },
+ 'variables': {
+ 'enable_wexit_time_destructors': 1,
+ 'host_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_HOST_BUNDLE_NAME@")',
+ 'prefpane_bundle_name': '<!(python <(version_py_path) -f <(branding_path) -t "@MAC_PREFPANE_BUNDLE_NAME@")',
+ },
'dependencies': [
'remoting_base',
'remoting_protocol',
'remoting_resources',
+ '../base/base.gyp:base_i18n',
'../crypto/crypto.gyp:crypto',
'../google_apis/google_apis.gyp:google_apis',
'../ipc/ipc.gyp:ipc',
'../ui/events/events.gyp:dom4_keycode_converter',
],
'defines': [
+ 'HOST_BUNDLE_NAME="<(host_bundle_name)"',
+ 'PREFPANE_BUNDLE_NAME="<(prefpane_bundle_name)"',
'VERSION=<(version_full)',
],
'sources': [
'host/disconnect_window_win.cc',
'host/dns_blackhole_checker.cc',
'host/dns_blackhole_checker.h',
+ 'host/gnubby_auth_handler.h',
'host/gnubby_auth_handler_posix.cc',
'host/gnubby_auth_handler_posix.h',
'host/gnubby_auth_handler_win.cc',
- 'host/gnubby_auth_handler.h',
'host/gnubby_socket.cc',
'host/gnubby_socket.h',
'host/heartbeat_sender.cc',
'host/host_exit_codes.cc',
'host/host_exit_codes.h',
'host/host_export.h',
+ 'host/host_extension.h',
+ 'host/host_extension_session.h',
'host/host_secret.cc',
'host/host_secret.h',
'host/host_status_monitor.h',
'host/json_host_config.h',
'host/linux/audio_pipe_reader.cc',
'host/linux/audio_pipe_reader.h',
+ 'host/linux/unicode_to_keysym.cc',
+ 'host/linux/unicode_to_keysym.h',
'host/linux/x11_util.cc',
'host/linux/x11_util.h',
'host/linux/x_server_clipboard.cc',
'host/screen_controls.h',
'host/screen_resolution.cc',
'host/screen_resolution.h',
- 'host/server_log_entry.cc',
- 'host/server_log_entry.h',
+ 'host/server_log_entry_host.cc',
+ 'host/server_log_entry_host.h',
'host/service_urls.cc',
'host/service_urls.h',
'host/session_manager_factory.cc',
}, # 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)',
- 'defines': [
- 'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)',
- ],
- 'dependencies': [
- '../base/base.gyp:base_i18n',
- '../net/net.gyp:net',
- '../third_party/npapi/npapi.gyp:npapi',
- 'remoting_base',
- 'remoting_host',
- 'remoting_host_setup_base',
- 'remoting_infoplist_strings',
- 'remoting_it2me_host_static',
- 'remoting_protocol',
- 'remoting_resources',
- ],
- 'sources': [
- 'base/dispatch_win.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',
- 'host/win/core_resource.h',
- ],
- 'conditions': [
- ['OS=="mac"', {
- 'mac_bundle': 1,
- 'xcode_settings': {
- 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
- 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist',
- 'INFOPLIST_PREPROCESS': 'YES',
- # TODO(maruel): Use INFOPLIST_PREFIX_HEADER to remove the need to
- # duplicate string once
- # http://code.google.com/p/gyp/issues/detail?id=243 is fixed.
- 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE="<(host_plugin_mime_type)" VERSION_FULL="<(version_full)" VERSION_SHORT="<(version_short)"',
- },
- # TODO(mark): Come up with a fancier way to do this. It should
- # only be necessary to list host_plugin-Info.plist once, not the
- # three times it is listed here.
- 'mac_bundle_resources': [
- 'host/disconnect_window.xib',
- 'host/plugin/host_plugin-Info.plist',
- 'resources/chromoting16.png',
- 'resources/chromoting48.png',
- 'resources/chromoting128.png',
- '<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(PRODUCT_DIR) <(remoting_locales))',
-
- # Localized strings for 'Info.plist'
- '<!@pymod_do_main(remoting_localize --locale_output '
- '"<(SHARED_INTERMEDIATE_DIR)/remoting/host_plugin-InfoPlist.strings/@{json_suffix}.lproj/InfoPlist.strings" '
- '--print_only <(remoting_locales))',
- ],
- 'mac_bundle_resources!': [
- 'host/plugin/host_plugin-Info.plist',
- ],
- 'conditions': [
- ['mac_breakpad==1', {
- 'variables': {
- # A real .dSYM is needed for dump_syms to operate on.
- 'mac_real_dsym': 1,
- },
- }],
- ], # conditions
- }], # OS=="mac"
- [ 'OS=="win"', {
- 'defines': [
- 'BINARY=BINARY_HOST_PLUGIN',
- 'ISOLATION_AWARE_ENABLED=1',
- ],
- 'dependencies': [
- 'remoting_lib_idl',
- 'remoting_windows_resources',
- ],
- 'include_dirs': [
- '<(INTERMEDIATE_DIR)',
- ],
- 'sources': [
- '<(SHARED_INTERMEDIATE_DIR)/remoting/core.rc',
- '<(SHARED_INTERMEDIATE_DIR)/remoting/version.rc',
- 'host/plugin/host_plugin.def',
- ],
- 'msvs_settings': {
- 'VCManifestTool': {
- 'EmbedManifest': 'true',
- 'AdditionalManifestFiles': [
- 'host/win/common-controls.manifest',
- ],
- },
- },
- }],
- ],
- }, # end of target 'remoting_host_plugin'
- {
'target_name': 'remoting_it2me_host_static',
'type': 'static_library',
'variables': { 'enable_wexit_time_destructors': 1, },
'remoting_resources',
],
'sources': [
- 'host/plugin/host_plugin-InfoPlist.strings.jinja2',
'host/remoting_me2me_host-InfoPlist.strings.jinja2',
'host/mac/me2me_preference_pane-InfoPlist.strings.jinja2',
'host/installer/mac/uninstaller/remoting_uninstaller-InfoPlist.strings.jinja2',
}], # mac_breakpad==1
], # conditions
}], # OS=mac
- # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
+ ['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
'host/setup/me2me_native_messaging_host_main.h',
],
'conditions': [
- # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
+ ['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
'../build/linux/system.gyp:gtk',
],
}],
- # TODO(dmikurube): Kill linux_use_tcmalloc. http://crbug.com/345554
- ['OS=="linux" and ((use_allocator!="none" and use_allocator!="see_use_tcmalloc") or (use_allocator=="see_use_tcmalloc" and linux_use_tcmalloc==1))', {
+ ['OS=="linux" and use_allocator!="none"', {
'dependencies': [
'../base/allocator/allocator.gyp:allocator',
],
},
'mac_bundle_resources': [
'<(PRODUCT_DIR)/icudtl.dat',
+ 'host/disconnect_window.xib',
'host/it2me/remote_assistance_host-Info.plist',
'<!@pymod_do_main(remoting_copy_locales -o -p <(OS) -x <(PRODUCT_DIR) <(remoting_locales))',
projects / platform / framework / web / crosswalk.git / blobdiff