diff options
author | sergeyu <sergeyu@chromium.org> | 2015-03-02 18:43:02 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-03 02:43:47 +0000 |
commit | d52d3afcec84f7e15692971de4b9f31bc236c594 (patch) | |
tree | e32974721a6481f5e0b79cb2b97496bc6613727d | |
parent | 2cee8dd7655a7ec82a8ce6f7b30f984d1e498d93 (diff) | |
download | chromium_src-d52d3afcec84f7e15692971de4b9f31bc236c594.zip chromium_src-d52d3afcec84f7e15692971de4b9f31bc236c594.tar.gz chromium_src-d52d3afcec84f7e15692971de4b9f31bc236c594.tar.bz2 |
Remove dependency on PAM from the It2Me host
BUG=463132
Review URL: https://codereview.chromium.org/969133002
Cr-Commit-Position: refs/heads/master@{#318819}
-rw-r--r-- | remoting/host/BUILD.gn | 5 | ||||
-rw-r--r-- | remoting/remoting_host.gypi | 29 | ||||
-rw-r--r-- | remoting/remoting_host_srcs.gypi | 3 |
3 files changed, 20 insertions, 17 deletions
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn index 12c6bd0..3b0e4ac 100644 --- a/remoting/host/BUILD.gn +++ b/remoting/host/BUILD.gn @@ -34,13 +34,13 @@ static_library("host") { "//ui/events:dom4_keycode_converter", ] - if (is_linux) { + if (is_linux && !is_chromeos) { libs += [ "pam" ] } if (use_x11) { configs += [ - #TODO : (kelvinp) Add GTK to the configs. + # TODO(kelvinp): Add GTK to the configs. "//build/config/linux:x11", ] } else { @@ -83,7 +83,6 @@ static_library("host") { "continue_window_linux.cc", "disconnect_window_linux.cc", "local_input_monitor_x11.cc", - "remoting_me2me_host.cc", ] } diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index e818a97..33d1e4a 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -75,11 +75,6 @@ ], }] ], - 'link_settings': { - 'libraries': [ - '-lpam', - ], - }, }], ['chromeos==1', { 'dependencies' : [ @@ -102,7 +97,6 @@ 'host/linux/x_server_clipboard.cc', 'host/linux/x_server_clipboard.h', 'host/local_input_monitor_x11.cc', - 'host/remoting_me2me_host.cc', ], 'conditions': [ ['use_ash==1', { @@ -144,7 +138,6 @@ 'link_settings': { 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework', - 'libpam.a', ], }, }], @@ -420,6 +413,8 @@ 'dependencies': [ '../base/base.gyp:base', '../base/base.gyp:base_i18n', + '../components/components.gyp:policy', + '../components/components.gyp:policy_component_common', '../net/net.gyp:net', '../third_party/webrtc/modules/modules.gyp:desktop_capture', 'remoting_base', @@ -435,14 +430,26 @@ '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': [ - ['os_posix != 1', { - 'sources/': [ - ['exclude', '^host/posix/'], - ], + ['OS=="linux"', { + 'link_settings': { + 'libraries': [ + '-lpam', + ], + }, + }], + ['OS=="mac"', { + 'link_settings': { + 'libraries': [ + 'libpam.a', + ], + }, }], ], # end of 'conditions' }, # end of target 'remoting_me2me_host_static' diff --git a/remoting/remoting_host_srcs.gypi b/remoting/remoting_host_srcs.gypi index fbdfc71..9c99640 100644 --- a/remoting/remoting_host_srcs.gypi +++ b/remoting/remoting_host_srcs.gypi @@ -187,8 +187,6 @@ 'host/pairing_registry_delegate_mac.cc', 'host/pairing_registry_delegate_win.cc', 'host/pairing_registry_delegate_win.h', - 'host/pam_authorization_factory_posix.cc', - 'host/pam_authorization_factory_posix.h', 'host/pin_hash.cc', 'host/pin_hash.h', 'host/policy_watcher.cc', @@ -197,7 +195,6 @@ 'host/register_support_host_request.h', 'host/remote_input_filter.cc', 'host/remote_input_filter.h', - 'host/remoting_me2me_host.cc', 'host/resizing_host_observer.cc', 'host/resizing_host_observer.h', 'host/sas_injector.h', |