summaryrefslogtreecommitdiffstats
path: root/remoting/remoting_host_srcs.gypi
diff options
context:
space:
mode:
authorLei Zhang <thestig@chromium.org>2014-11-12 19:18:40 -0800
committerLei Zhang <thestig@chromium.org>2014-11-13 03:20:16 +0000
commit67f2f75837c4ba2e877bb5fd2ff2da7149bfcc32 (patch)
tree8c2a74e36abd72e2f911716007e76def240c4e39 /remoting/remoting_host_srcs.gypi
parent18ffa032d49f63f8ae00e68ea7a870e61527bea5 (diff)
downloadchromium_src-67f2f75837c4ba2e877bb5fd2ff2da7149bfcc32.zip
chromium_src-67f2f75837c4ba2e877bb5fd2ff2da7149bfcc32.tar.gz
chromium_src-67f2f75837c4ba2e877bb5fd2ff2da7149bfcc32.tar.bz2
Revert "Remote assistance on Chrome OS Part VIII - Compile on Ozone"
This reverts commit 18ffa032d49f63f8ae00e68ea7a870e61527bea5. It broke ChromiumOS GN. R=kelvinp@chromium.org Review URL: https://codereview.chromium.org/718313002 Cr-Commit-Position: refs/heads/master@{#303972}
Diffstat (limited to 'remoting/remoting_host_srcs.gypi')
-rw-r--r--remoting/remoting_host_srcs.gypi15
1 files changed, 5 insertions, 10 deletions
diff --git a/remoting/remoting_host_srcs.gypi b/remoting/remoting_host_srcs.gypi
index 2f42525..c28af6a 100644
--- a/remoting/remoting_host_srcs.gypi
+++ b/remoting/remoting_host_srcs.gypi
@@ -24,12 +24,8 @@
'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',
@@ -44,6 +40,8 @@
'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',
@@ -80,7 +78,7 @@
'host/desktop_shape_tracker.h',
'host/desktop_shape_tracker_mac.cc',
'host/desktop_shape_tracker_win.cc',
- 'host/desktop_shape_tracker_linux.cc',
+ 'host/desktop_shape_tracker_x11.cc',
'host/disconnect_window_chromeos.cc',
'host/disconnect_window_linux.cc',
'host/disconnect_window_mac.h',
@@ -125,11 +123,9 @@
'host/in_memory_host_config.cc',
'host/in_memory_host_config.h',
'host/input_injector.h',
- 'host/input_injector_chromeos.cc',
- 'host/input_injector_chromeos.h',
+ 'host/input_injector_linux.cc',
'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',
@@ -162,10 +158,9 @@
'host/linux/x_server_clipboard.cc',
'host/linux/x_server_clipboard.h',
'host/local_input_monitor.h',
- 'host/local_input_monitor_chromeos.cc',
+ 'host/local_input_monitor_linux.cc',
'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',