Commit 02436fb8 authored by sergeyu@chromium.org's avatar sergeyu@chromium.org

Cleanup list of source files in remoting targets

Some files were compiled for both remoting_host and remoting_core. Also
moved some files to remoting_host so that they don't need to be listed
multiple times for different platforms

Review URL: https://codereview.chromium.org/393073002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283597 0039d316-1c4b-4281-b951-d872f2087c98
parent bc944cf3
...@@ -237,3 +237,9 @@ int HostMain(int argc, char** argv) { ...@@ -237,3 +237,9 @@ int HostMain(int argc, char** argv) {
} }
} // namespace remoting } // namespace remoting
#if !defined(OS_WIN)
int main(int argc, char** argv) {
return remoting::HostMain(argc, argv);
}
#endif // !defined(OS_WIN)
...@@ -1376,9 +1376,3 @@ int HostProcessMain() { ...@@ -1376,9 +1376,3 @@ int HostProcessMain() {
} }
} // namespace remoting } // namespace remoting
#if !defined(OS_WIN)
int main(int argc, char** argv) {
return remoting::HostMain(argc, argv);
}
#endif // !defined(OS_WIN)
...@@ -176,10 +176,6 @@ class Me2MeNativeMessagingHost { ...@@ -176,10 +176,6 @@ class Me2MeNativeMessagingHost {
DISALLOW_COPY_AND_ASSIGN(Me2MeNativeMessagingHost); DISALLOW_COPY_AND_ASSIGN(Me2MeNativeMessagingHost);
}; };
// Creates a Me2MeNativeMessagingHost instance, attaches it to stdin/stdout and
// runs the message loop until Me2MeNativeMessagingHost signals shutdown.
int Me2MeNativeMessagingHostMain();
} // namespace remoting } // namespace remoting
#endif // REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_ #endif // REMOTING_HOST_SETUP_ME2ME_NATIVE_MESSAGING_HOST_H_
...@@ -218,6 +218,7 @@ ...@@ -218,6 +218,7 @@
'host/register_support_host_request.h', 'host/register_support_host_request.h',
'host/remote_input_filter.cc', 'host/remote_input_filter.cc',
'host/remote_input_filter.h', 'host/remote_input_filter.h',
'host/remoting_me2me_host.cc',
'host/resizing_host_observer.cc', 'host/resizing_host_observer.cc',
'host/resizing_host_observer.h', 'host/resizing_host_observer.h',
'host/sas_injector.h', 'host/sas_injector.h',
...@@ -425,6 +426,8 @@ ...@@ -425,6 +426,8 @@
'host/setup/daemon_controller_delegate_win.h', 'host/setup/daemon_controller_delegate_win.h',
'host/setup/daemon_installer_win.cc', 'host/setup/daemon_installer_win.cc',
'host/setup/daemon_installer_win.h', 'host/setup/daemon_installer_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.cc',
'host/setup/oauth_client.h', 'host/setup/oauth_client.h',
'host/setup/oauth_helper.cc', 'host/setup/oauth_helper.cc',
...@@ -593,7 +596,6 @@ ...@@ -593,7 +596,6 @@
'sources': [ 'sources': [
'host/host_main.cc', 'host/host_main.cc',
'host/host_main.h', 'host/host_main.h',
'host/remoting_me2me_host.cc',
], ],
'conditions': [ 'conditions': [
['OS=="mac"', { ['OS=="mac"', {
...@@ -679,8 +681,6 @@ ...@@ -679,8 +681,6 @@
'VERSION=<(version_full)', 'VERSION=<(version_full)',
], ],
'sources': [ 'sources': [
'host/setup/me2me_native_messaging_host.cc',
'host/setup/me2me_native_messaging_host.h',
'host/setup/me2me_native_messaging_host_entry_point.cc', 'host/setup/me2me_native_messaging_host_entry_point.cc',
'host/setup/me2me_native_messaging_host_main.cc', 'host/setup/me2me_native_messaging_host_main.cc',
'host/setup/me2me_native_messaging_host_main.h', 'host/setup/me2me_native_messaging_host_main.h',
......
...@@ -199,15 +199,8 @@ ...@@ -199,15 +199,8 @@
'host/desktop_process_main.cc', 'host/desktop_process_main.cc',
'host/host_main.cc', 'host/host_main.cc',
'host/host_main.h', 'host/host_main.h',
'host/ipc_constants.cc',
'host/ipc_constants.h',
'host/it2me/it2me_native_messaging_host_main.cc', 'host/it2me/it2me_native_messaging_host_main.cc',
'host/it2me/it2me_native_messaging_host_main.h', 'host/it2me/it2me_native_messaging_host_main.h',
'host/remoting_me2me_host.cc',
'host/sas_injector.h',
'host/sas_injector_win.cc',
'host/setup/me2me_native_messaging_host.cc',
'host/setup/me2me_native_messaging_host.h',
'host/setup/me2me_native_messaging_host_main.cc', 'host/setup/me2me_native_messaging_host_main.cc',
'host/setup/me2me_native_messaging_host_main.h', 'host/setup/me2me_native_messaging_host_main.h',
'host/verify_config_window_win.cc', 'host/verify_config_window_win.cc',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment