summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_host.gypi
diff options
context:
space:
mode:
authorkelvinp <kelvinp@chromium.org>2014-11-12 18:52:54 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-13 02:54:17 +0000
commit18ffa032d49f63f8ae00e68ea7a870e61527bea5 (patch)
treecf0a109e9d076da94e358abb9bdd2d90bebe392c /remoting/remoting_host.gypi
parentfe48afde26a29b787ed34e2fa8c5ddf71c41f769 (diff)
downloadchromium_src-18ffa032d49f63f8ae00e68ea7a870e61527bea5.zip
chromium_src-18ffa032d49f63f8ae00e68ea7a870e61527bea5.tar.gz
chromium_src-18ffa032d49f63f8ae00e68ea7a870e61527bea5.tar.bz2
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 Review URL: https://codereview.chromium.org/700333007 Cr-Commit-Position: refs/heads/master@{#303971}
Diffstat (limited to 'remoting/remoting_host.gypi')
-rw-r--r--remoting/remoting_host.gypi61
1 files changed, 34 insertions, 27 deletions
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': [