| Index: remoting/remoting.gyp
|
| diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
|
| index e8f64c4bf7b9807372606ef8382bdb11f7946fb8..b2c7fc7b269f9980474d38d566d80d4f0063ac14 100644
|
| --- a/remoting/remoting.gyp
|
| +++ b/remoting/remoting.gyp
|
| @@ -167,29 +167,21 @@
|
| '../third_party/npapi/npapi.gyp:npapi',
|
| ],
|
| 'sources': [
|
| - 'host/continue_window.h',
|
| - 'host/continue_window_mac.mm',
|
| - 'host/continue_window_linux.cc',
|
| - 'host/continue_window_win.cc',
|
| - 'host/disconnect_window_linux.cc',
|
| - 'host/disconnect_window_mac.h',
|
| - 'host/disconnect_window_mac.mm',
|
| - 'host/disconnect_window_win.cc',
|
| - 'host/host_plugin.cc',
|
| - 'host/host_plugin.def',
|
| - 'host/host_plugin.rc',
|
| - 'host/host_plugin_resource.h',
|
| - 'host/host_plugin_utils.cc',
|
| - 'host/host_plugin_utils.h',
|
| - 'host/host_script_object.cc',
|
| - 'host/host_script_object.h',
|
| + 'host/plugin/host_plugin.cc',
|
| + 'host/plugin/host_plugin.def',
|
| + 'host/plugin/host_plugin.rc',
|
| + 'host/plugin/host_plugin_resource.h',
|
| + '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"', {
|
| 'mac_bundle': 1,
|
| 'xcode_settings': {
|
| 'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
|
| - 'INFOPLIST_FILE': 'host/host_plugin-Info.plist',
|
| + 'INFOPLIST_FILE': 'host/plugin/host_plugin-Info.plist',
|
| 'INFOPLIST_PREPROCESS': 'YES',
|
| 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'HOST_PLUGIN_MIME_TYPE=<(host_plugin_mime_type)',
|
| 'WRAPPER_EXTENSION': '<(plugin_extension)',
|
| @@ -209,10 +201,10 @@
|
| # three times it is listed here.
|
| 'mac_bundle_resources': [
|
| 'host/disconnect_window.xib',
|
| - 'host/host_plugin-Info.plist',
|
| + 'host/plugin/host_plugin-Info.plist',
|
| ],
|
| 'mac_bundle_resources!': [
|
| - 'host/host_plugin-Info.plist',
|
| + 'host/plugin/host_plugin-Info.plist',
|
| ],
|
| }],
|
| ['OS=="win"', { # TODO(wez): Remove if libvpx is built by MSVC.
|
| @@ -226,8 +218,8 @@
|
| }],
|
| ['OS!="win"', {
|
| 'sources!': [
|
| - 'host/host_plugin.def',
|
| - 'host/host_plugin.rc',
|
| + 'host/plugin/host_plugin.def',
|
| + 'host/plugin/host_plugin.rc',
|
| ],
|
| }],
|
| ],
|
| @@ -376,6 +368,10 @@
|
| 'host/chromoting_host_context.h',
|
| 'host/client_session.cc',
|
| 'host/client_session.h',
|
| + 'host/continue_window.h',
|
| + 'host/continue_window_mac.mm',
|
| + 'host/continue_window_linux.cc',
|
| + 'host/continue_window_win.cc',
|
| 'host/curtain.h',
|
| 'host/curtain_linux.cc',
|
| 'host/curtain_mac.cc',
|
| @@ -384,6 +380,10 @@
|
| 'host/desktop_environment.h',
|
| 'host/differ.h',
|
| 'host/differ.cc',
|
| + 'host/disconnect_window_linux.cc',
|
| + 'host/disconnect_window_mac.h',
|
| + 'host/disconnect_window_mac.mm',
|
| + 'host/disconnect_window_win.cc',
|
| 'host/event_executor.h',
|
| 'host/event_executor_linux.cc',
|
| 'host/event_executor_mac.cc',
|
|
|