From 95f5484078fada16ca43bf958dd1508fb7e2b832 Mon Sep 17 00:00:00 2001 From: kelvinp Date: Thu, 13 Nov 2014 13:42:20 -0800 Subject: Remote assistance on Chrome OS Part VIII - Compile on Ozone This CL makes It2Me host compile on platforms that uses Ozone. It replaces the X11-based LocalInputMonitor, MouseCursorMonitor and InputInjector with placeholder implementations for Chrome OS. An actual implementation is provided for the LocalInputMonitor with code ported from https://codereview.chromium.org/652293003/. BUG=431876 Committed: https://crrev.com/18ffa032d49f63f8ae00e68ea7a870e61527bea5 Cr-Commit-Position: refs/heads/master@{#303971} Review URL: https://codereview.chromium.org/700333007 Cr-Commit-Position: refs/heads/master@{#304091} --- remoting/remoting_host.gypi | 61 +++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 27 deletions(-) (limited to 'remoting/remoting_host.gypi') diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi index 08d6639..efe36d1 100644 --- a/remoting/remoting_host.gypi +++ b/remoting/remoting_host.gypi @@ -21,7 +21,8 @@ 'enable_it2me_host': 0, 'enable_remoting_host': 0, }], - ['chromeos==1 and use_x11==1', { + ['chromeos==1', { + 'enable_remoting_host': 1, 'enable_me2me_host': 0, 'enable_it2me_host': 1, }], @@ -60,13 +61,23 @@ ], 'conditions': [ ['OS=="linux"', { - 'dependencies': [ - '../build/linux/system.gyp:x11', - '../build/linux/system.gyp:xext', - '../build/linux/system.gyp:xfixes', - '../build/linux/system.gyp:xi', - '../build/linux/system.gyp:xrandr', - '../build/linux/system.gyp:xtst', + 'conditions': [ + ['use_x11==1', { + 'dependencies': [ + '../build/linux/system.gyp:x11', + '../build/linux/system.gyp:xext', + '../build/linux/system.gyp:xfixes', + '../build/linux/system.gyp:xi', + '../build/linux/system.gyp:xrandr', + '../build/linux/system.gyp:xtst', + ], + }], + ['chromeos==0 and use_ozone==0', { + 'dependencies': [ + # use GTK on Linux, even for Aura builds. + '../build/linux/system.gyp:gtk', + ], + }] ], 'link_settings': { 'libraries': [ @@ -74,12 +85,6 @@ ], }, }], - ['OS=="linux" and chromeos==0 and use_ozone==0', { - 'dependencies' : [ - # Always use GTK on Linux, even for Aura builds. - '../build/linux/system.gyp:gtk', - ], - }], ['chromeos==1', { 'dependencies' : [ '../cc/cc.gyp:cc', @@ -90,6 +95,7 @@ '../ui/aura/aura.gyp:aura', '../ui/compositor/compositor.gyp:compositor', '../ui/events/events.gyp:events', + '../ui/events/platform/events_platform.gyp:events_platform', '../ui/views/views.gyp:views', ], 'include_dirs': [ @@ -99,21 +105,22 @@ 'host/clipboard_x11.cc', 'host/continue_window_linux.cc', 'host/disconnect_window_linux.cc', + 'host/linux/x_server_clipboard.cc', + 'host/linux/x_server_clipboard.h', 'host/policy_hack/policy_watcher_linux.cc', 'host/remoting_me2me_host.cc', - ] - }, { # chromeos==0 - 'sources!' : [ - 'host/chromeos/aura_desktop_capturer.cc', - 'host/chromeos/aura_desktop_capturer.h', - 'host/chromeos/message_box.cc', - 'host/chromeos/message_box.h', - 'host/clipboard_aura.cc', - 'host/clipboard_aura.h', - 'host/continue_window_chromeos.cc', - 'host/disconnect_window_chromeos.cc', - 'host/policy_hack/policy_watcher_chromeos.cc', - ], + ], + 'conditions': [ + ['use_ozone==0', { + 'sources!': [ + 'host/input_injector_chromeos.cc', + 'host/input_injector_chromeos.h', + 'host/local_input_monitor_chromeos.cc', + 'host/chromeos/mouse_cursor_monitor_aura.cc', + 'host/chromeos/mouse_cursor_monitor_aura.h', + ], + }], + ], }], ['OS=="mac"', { 'dependencies': [ -- cgit v1.1