diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-24 11:30:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-10-30 12:56:19 +0000 |
| commit | 6036726eb981b6c4b42047513b9d3f4ac865daac (patch) | |
| tree | 673593e70678e7789766d1f732eb51f613a2703b /chromium/remoting/host/BUILD.gn | |
| parent | 466052c4e7c052268fd931888cd58961da94c586 (diff) | |
| download | qtwebengine-chromium-6036726eb981b6c4b42047513b9d3f4ac865daac.tar.gz | |
BASELINE: Update Chromium to 70.0.3538.78
Change-Id: Ie634710bf039e26c1957f4ae45e101bd4c434ae7
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/remoting/host/BUILD.gn')
| -rw-r--r-- | chromium/remoting/host/BUILD.gn | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/chromium/remoting/host/BUILD.gn b/chromium/remoting/host/BUILD.gn index b495aded5d0..563d8318c23 100644 --- a/chromium/remoting/host/BUILD.gn +++ b/chromium/remoting/host/BUILD.gn @@ -207,11 +207,6 @@ static_library("host") { "ipc_video_frame_capturer.h", "it2me_desktop_environment.cc", "it2me_desktop_environment.h", - "local_input_monitor.h", - "local_input_monitor_chromeos.cc", - "local_input_monitor_mac.mm", - "local_input_monitor_win.cc", - "local_input_monitor_x11.cc", "logging.h", "logging_linux.cc", "logging_mac.cc", @@ -301,6 +296,7 @@ static_library("host") { "//media", "//remoting/base", "//remoting/base:authorization", + "//remoting/host/input_monitor", "//remoting/host/security_key", "//remoting/protocol", "//remoting/resources", @@ -348,7 +344,6 @@ static_library("host") { "clipboard_x11.cc", "desktop_resizer_x11.cc", "input_injector_x11.cc", - "local_input_monitor_x11.cc", ] } @@ -382,7 +377,6 @@ static_library("host") { "desktop_resizer_x11.cc", "input_injector_chromeos.cc", "input_injector_chromeos.h", - "local_input_monitor_x11.cc", ] } } @@ -471,11 +465,11 @@ source_set("unit_tests") { "host_extension_session_manager_unittest.cc", "host_power_save_blocker_unittest.cc", "host_status_logger_unittest.cc", + "input_monitor/local_input_monitor_unittest.cc", "ipc_desktop_environment_unittest.cc", "it2me/it2me_confirmation_dialog_proxy_unittest.cc", "it2me/it2me_host_unittest.cc", "it2me/it2me_native_messaging_host_unittest.cc", - "local_input_monitor_unittest.cc", "mouse_cursor_monitor_proxy_unittest.cc", "mouse_shape_pump_unittest.cc", "native_messaging/native_messaging_reader_unittest.cc", @@ -500,7 +494,7 @@ source_set("unit_tests") { ] if (use_ozone || is_chromeos) { - sources -= [ "local_input_monitor_unittest.cc" ] + sources -= [ "input_monitor/local_input_monitor_unittest.cc" ] } configs += [ "//remoting/build/config:version" ] @@ -598,6 +592,7 @@ if (enable_remoting_host) { deps += [ "//google_apis", + "//mojo/core/embedder", "//net", "//remoting/host/setup", ] @@ -621,7 +616,9 @@ if (enable_remoting_host) { script = "../tools/build/remoting_localize.py" sources = [ + "it2me/com.google.chrome.remote_assistance-firefox.json.jinja2", "it2me/com.google.chrome.remote_assistance.json.jinja2", + "setup/com.google.chrome.remote_desktop-firefox.json.jinja2", "setup/com.google.chrome.remote_desktop.json.jinja2", ] @@ -699,6 +696,7 @@ if (enable_me2me_host) { "//base:i18n", "//components/policy/core/common", "//ipc", + "//mojo/core/embedder", "//net", "//remoting/base", "//remoting/host", @@ -729,10 +727,6 @@ if (enable_me2me_host) { if (is_mac && is_official_build) { sources += [ "internal/internal_mac-inl.h" ] } - - if (remoting_multi_process != 0) { - deps += [ "//mojo/core/embedder" ] - } } if (is_win) { |