diff options
| author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-29 14:10:00 +0000 |
|---|---|---|
| committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-29 14:10:00 +0000 |
| commit | 31f71b329a4ffe735a7af3ceb27dcd559d943a05 (patch) | |
| tree | 2a641db384fcb98c08d2e17990766d8047455131 /remoting/remoting.gyp | |
| parent | 19a0ee47090984c3f3bb3f04d5e58656a2075b7b (diff) | |
| download | chromium_src-31f71b329a4ffe735a7af3ceb27dcd559d943a05.zip chromium_src-31f71b329a4ffe735a7af3ceb27dcd559d943a05.tar.gz chromium_src-31f71b329a4ffe735a7af3ceb27dcd559d943a05.tar.bz2 | |
Move DaemonController to remoting/host/setup
DaemonController will be used outside of the plugin, so it doesn't make
sense to keep it in the plugin directory.
Review URL: https://chromiumcodereview.appspot.com/10985086
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@159402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/remoting.gyp')
| -rw-r--r-- | remoting/remoting.gyp | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp index c5c49d9..ba03b96 100644 --- a/remoting/remoting.gyp +++ b/remoting/remoting.gyp @@ -1017,6 +1017,29 @@ }, # end of target 'remoting_host_event_logger' { + 'target_name': 'remoting_host_setup_base', + 'type': 'static_library', + 'variables': { 'enable_wexit_time_destructors': 1, }, + 'dependencies': [ + '../base/base.gyp:base', + 'remoting_host', + ], + 'sources': [ + 'host/setup/daemon_controller.h', + 'host/setup/daemon_controller_linux.cc', + 'host/setup/daemon_controller_mac.cc', + 'host/setup/daemon_controller_win.cc', + ], + 'conditions': [ + ['OS=="win"', { + 'dependencies': [ + 'remoting_elevated_controller', + ], + }], + ], + }, # end of target 'remoting_breakpad' + + { 'target_name': 'remoting_host_plugin', 'type': 'loadable_module', 'variables': { 'enable_wexit_time_destructors': 1, }, @@ -1025,6 +1048,7 @@ 'dependencies': [ 'remoting_base', 'remoting_host', + 'remoting_host_setup_base', 'remoting_host_event_logger', 'remoting_jingle_glue', '../net/net.gyp:net', @@ -1035,10 +1059,6 @@ 'host/branding.cc', 'host/branding.h', 'host/host_ui_resource.h', - 'host/plugin/daemon_controller.h', - 'host/plugin/daemon_controller_linux.cc', - 'host/plugin/daemon_controller_mac.cc', - 'host/plugin/daemon_controller_win.cc', 'host/plugin/daemon_installer_win.cc', 'host/plugin/daemon_installer_win.h', 'host/plugin/host_log_handler.cc', |