Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(428)

Unified Diff: remoting/host/BUILD.gn

Issue 718313002: Revert "Remote assistance on Chrome OS Part VIII - Compile on Ozone" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_browser_extensions.gypi ('k') | remoting/host/basic_desktop_environment.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/host/BUILD.gn
diff --git a/remoting/host/BUILD.gn b/remoting/host/BUILD.gn
index 6b36c9bd77ae98cb07707fa0d45769c765b08ab2..d7be0c3c99650a66488802dfb075ce59cfbe2d1f 100644
--- a/remoting/host/BUILD.gn
+++ b/remoting/host/BUILD.gn
@@ -30,7 +30,6 @@ static_library("host") {
"//remoting/base",
"//remoting/protocol",
"//remoting/resources",
- "//ui/events/platform",
"//ui/events:dom4_keycode_converter",
]
@@ -44,11 +43,7 @@ static_library("host") {
"//build/config/linux:x11",
]
} else {
- sources -= [
- "clipboard_x11.cc",
- "linux/x_server_clipboard.cc",
- "linux/x_server_clipboard.h",
- ]
+ sources -= [ "clipboard_x11.cc" ]
}
if (is_chromeos) {
@@ -68,30 +63,19 @@ static_library("host") {
deps += [ "//ash" ]
}
- if (use_ozone) {
- sources -= [
- "input_injector_x11.cc",
- "local_input_monitor_x11.cc",
- ]
- } else {
- sources -= [
- "chromeos/mouse_cursor_monitor_aura.cc",
- "chromeos/mouse_cursor_monitor_aura.h",
- "clipboard_x11.cc",
- "input_injector_chromeos.cc",
- "input_injector_chromeos.h",
- "linux/x_server_clipboard.cc",
- "linux/x_server_clipboard.h",
- "local_input_monitor_chromeos.cc",
- ]
- }
-
sources -= [
+ "clipboard_x11.cc",
"continue_window_linux.cc",
"disconnect_window_linux.cc",
"policy_hack/policy_watcher_linux.cc",
"remoting_me2me_host.cc",
]
+
+ } else {
+ sources -= [
+ "clipboard_aura.cc",
+ "clipboard_aura.h",
+ ]
}
if (is_mac) {
« no previous file with comments | « chrome/chrome_browser_extensions.gypi ('k') | remoting/host/basic_desktop_environment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698