summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_host.gypi
diff options
context:
space:
mode:
authorkelvinp <kelvinp@chromium.org>2014-11-10 18:45:25 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-11 02:45:51 +0000
commit1d3fbc02ea36d1054ed570bdf2fdb2d46e88e9ba (patch)
tree275d805d3fa559963862799905e22faadd5d4c87 /remoting/remoting_host.gypi
parentada4a807bb8953b86bbc6c573a0a6c07801f91a9 (diff)
downloadchromium_src-1d3fbc02ea36d1054ed570bdf2fdb2d46e88e9ba.zip
chromium_src-1d3fbc02ea36d1054ed570bdf2fdb2d46e88e9ba.tar.gz
chromium_src-1d3fbc02ea36d1054ed570bdf2fdb2d46e88e9ba.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@{#303578}
Diffstat (limited to 'remoting/remoting_host.gypi')
-rw-r--r--remoting/remoting_host.gypi77
1 files changed, 45 insertions, 32 deletions
diff --git a/remoting/remoting_host.gypi b/remoting/remoting_host.gypi
index 60e0c38..5f08c2a 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,
}],
@@ -74,8 +75,12 @@
'host/capture_scheduler.h',
'host/chromeos/aura_desktop_capturer.cc',
'host/chromeos/aura_desktop_capturer.h',
+ 'host/chromeos/clipboard_aura.cc',
+ 'host/chromeos/clipboard_aura.h',
'host/chromeos/message_box.cc',
'host/chromeos/message_box.h',
+ 'host/chromeos/mouse_cursor_monitor_aura.cc',
+ 'host/chromeos/mouse_cursor_monitor_aura.h',
'host/chromium_port_allocator_factory.cc',
'host/chromium_port_allocator_factory.h',
'host/chromoting_host.cc',
@@ -90,8 +95,6 @@
'host/client_session.h',
'host/client_session_control.h',
'host/clipboard.h',
- 'host/clipboard_aura.cc',
- 'host/clipboard_aura.h',
'host/clipboard_mac.mm',
'host/clipboard_win.cc',
'host/clipboard_x11.cc',
@@ -128,7 +131,7 @@
'host/desktop_shape_tracker.h',
'host/desktop_shape_tracker_mac.cc',
'host/desktop_shape_tracker_win.cc',
- 'host/desktop_shape_tracker_x11.cc',
+ 'host/desktop_shape_tracker_linux.cc',
'host/disconnect_window_chromeos.cc',
'host/disconnect_window_linux.cc',
'host/disconnect_window_mac.h',
@@ -173,9 +176,11 @@
'host/in_memory_host_config.cc',
'host/in_memory_host_config.h',
'host/input_injector.h',
- 'host/input_injector_linux.cc',
+ 'host/input_injector_chromeos.cc',
+ 'host/input_injector_chromeos.h',
'host/input_injector_mac.cc',
'host/input_injector_win.cc',
+ 'host/input_injector_x11.cc',
'host/ipc_audio_capturer.cc',
'host/ipc_audio_capturer.h',
'host/ipc_constants.cc',
@@ -208,9 +213,11 @@
'host/linux/x_server_clipboard.cc',
'host/linux/x_server_clipboard.h',
'host/local_input_monitor.h',
- 'host/local_input_monitor_linux.cc',
+ 'host/local_input_monitor_chromeos.cc',
+ 'host/local_input_monitor_chromeos.h',
'host/local_input_monitor_mac.mm',
'host/local_input_monitor_win.cc',
+ 'host/local_input_monitor_x11.cc',
'host/logging.h',
'host/logging_posix.cc',
'host/logging_win.cc',
@@ -303,13 +310,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': [
@@ -317,12 +334,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',
@@ -333,6 +344,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': [
@@ -343,21 +355,22 @@
'host/continue_window_linux.cc',
'host/disconnect_window.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': [