diff options
Diffstat (limited to 'remoting/remoting_host.gypi')
| -rw-r--r-- | remoting/remoting_host.gypi | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index fdc333e..aca9d71 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -23,7 +23,7 @@ }], ['chromeos==1', { 'enable_me2me_host': 0, - 'enable_it2me_host': 0, + 'enable_it2me_host': 1, }], ], }, @@ -98,6 +98,7 @@ 'host/constants_mac.h', 'host/continue_window.cc', 'host/continue_window.h', + 'host/continue_window_chromeos.cc', 'host/continue_window_linux.cc', 'host/continue_window_mac.mm', 'host/continue_window_win.cc', @@ -124,6 +125,7 @@ 'host/desktop_shape_tracker_mac.cc', 'host/desktop_shape_tracker_win.cc', 'host/desktop_shape_tracker_x11.cc', + 'host/disconnect_window_chromeos.cc', 'host/disconnect_window_linux.cc', 'host/disconnect_window_mac.h', 'host/disconnect_window_mac.mm', @@ -227,6 +229,7 @@ 'host/pin_hash.h', 'host/policy_hack/policy_watcher.cc', 'host/policy_hack/policy_watcher.h', + 'host/policy_hack/policy_watcher_chromeos.cc', 'host/policy_hack/policy_watcher_linux.cc', 'host/policy_hack/policy_watcher_mac.mm', 'host/policy_hack/policy_watcher_win.cc', @@ -319,6 +322,7 @@ ['chromeos==1', { 'dependencies' : [ '../cc/cc.gyp:cc', + '../components/components.gyp:policy_component_common', '../content/content.gyp:content', '../ppapi/ppapi_internal.gyp:ppapi_host', '../skia/skia.gyp:skia', @@ -329,8 +333,7 @@ '../third_party/skia/include/utils', ], 'sources!' : [ - 'host/continue_window.cc', - 'host/continue_window.h', + 'host/policy_hack/policy_watcher_linux.cc', 'host/continue_window_linux.cc', 'host/disconnect_window.cc', 'host/disconnect_window_linux.cc', @@ -340,6 +343,9 @@ 'sources!' : [ 'host/chromeos/aura_desktop_capturer.cc', 'host/chromeos/aura_desktop_capturer.h', + 'host/continue_window_chromeos.cc', + 'host/disconnect_window_chromeos.cc', + 'host/policy_hack/policy_watcher_chromeos.cc', ], }], ['OS=="mac"', { @@ -853,7 +859,7 @@ ], # targets }], # end of OS!="win" and enable_me2me_host==1 - ['OS!="win" and enable_it2me_host==1', { + ['OS!="win" and enable_it2me_host==1 and chromeos==0', { 'targets': [ { 'target_name': 'remoting_it2me_native_messaging_host', |