diff options
| author | sergeyu <sergeyu@chromium.org> | 2015-11-03 12:11:30 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-11-03 20:13:13 +0000 |
| commit | c7e4ace65da70496f88363b61875b682b82ac690 (patch) | |
| tree | 34700fd10f0c0220bc7b29f405660f296aedfda3 /remoting | |
| parent | 9d53fcdaa97546700a93c9cb917666e5ae948ba3 (diff) | |
| download | chromium_src-c7e4ace65da70496f88363b61875b682b82ac690.zip chromium_src-c7e4ace65da70496f88363b61875b682b82ac690.tar.gz chromium_src-c7e4ace65da70496f88363b61875b682b82ac690.tar.bz2 | |
Move curtain_mode and signal_handler to remoting_host
There is no reason curtain_mode and signal_handler need to be
in remoting_me2me_host_static instead of remoting_host. Also currently
try bots don't compile Me2Me host and so they don't detect some
potential breakages, e.g. as in
https://codereview.chromium.org/1430503002/ .
Also added USE_REMOTING_MACOSX_INTERNAL which was missing in the GN build
Review URL: https://codereview.chromium.org/1417853005
Cr-Commit-Position: refs/heads/master@{#357600}
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/host/BUILD.gn | 13 | ||||
| -rw-r--r-- | remoting/remoting_host.gypi | 7 | ||||
| -rw-r--r-- | remoting/remoting_host_srcs.gypi | 6 |
3 files changed, 14 insertions, 12 deletions
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn index 7d171a8..124ca2a 100644 --- a/remoting/host/BUILD.gn +++ b/remoting/host/BUILD.gn @@ -153,6 +153,7 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. sources -= [ "continue_window_linux.cc", + "curtain_mode_linux.cc", "disconnect_window_linux.cc", ] } @@ -423,16 +424,11 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. if (enable_me2me_host) { source_set("remoting_me2me_host_static") { sources = [ - "curtain_mode.h", - "curtain_mode_linux.cc", - "curtain_mode_mac.cc", - "curtain_mode_win.cc", "pam_authorization_factory_posix.cc", "pam_authorization_factory_posix.h", - "posix/signal_handler.cc", - "posix/signal_handler.h", "remoting_me2me_host.cc", ] + defines = [] configs += [ "//remoting:version" ] @@ -461,6 +457,11 @@ if (is_mac) { # TODO(GYP) Mac build of remoting host. if ((is_linux && !is_chromeos) || is_mac) { libs = [ "pam" ] } + + if (is_mac && is_official_build) { + sources += [ "internal/internal_mac-inl.h" ] + defines += [ "USE_REMOTING_MACOSX_INTERNAL" ] + } } if (!is_win) { diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index de2a5d96..27389ee 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -95,6 +95,7 @@ 'sources!' : [ 'host/clipboard_x11.cc', 'host/continue_window_linux.cc', + 'host/curtain_mode_linux.cc', 'host/disconnect_window_linux.cc', 'host/linux/x_server_clipboard.cc', 'host/linux/x_server_clipboard.h', @@ -419,14 +420,8 @@ 'VERSION=<(version_full)', ], 'sources': [ - 'host/curtain_mode.h', - 'host/curtain_mode_linux.cc', - 'host/curtain_mode_mac.cc', - 'host/curtain_mode_win.cc', 'host/pam_authorization_factory_posix.cc', 'host/pam_authorization_factory_posix.h', - 'host/posix/signal_handler.cc', - 'host/posix/signal_handler.h', 'host/remoting_me2me_host.cc', ], 'conditions': [ diff --git a/remoting/remoting_host_srcs.gypi b/remoting/remoting_host_srcs.gypi index 363a67d..306c070 100644 --- a/remoting/remoting_host_srcs.gypi +++ b/remoting/remoting_host_srcs.gypi @@ -64,6 +64,10 @@ 'host/continue_window_linux.cc', 'host/continue_window_mac.mm', 'host/continue_window_win.cc', + 'host/curtain_mode.h', + 'host/curtain_mode_linux.cc', + 'host/curtain_mode_mac.cc', + 'host/curtain_mode_win.cc', 'host/daemon_process.cc', 'host/daemon_process.h', 'host/daemon_process_win.cc', @@ -201,6 +205,8 @@ 'host/pin_hash.h', 'host/policy_watcher.cc', 'host/policy_watcher.h', + 'host/posix/signal_handler.cc', + 'host/posix/signal_handler.h', 'host/register_support_host_request.cc', 'host/register_support_host_request.h', 'host/remote_input_filter.cc', |