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

Unified Diff: ui/events/platform/x11/BUILD.gn

Issue 1602173005: Add PlatformWindow/Event related code for Ozone X11. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix deps problem. Created 4 years, 11 months 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
Index: ui/events/platform/x11/BUILD.gn
diff --git a/ui/events/platform/x11/BUILD.gn b/ui/events/platform/x11/BUILD.gn
index e55afc7ee6f5f7146d458f9b54ebbe3500c76bf6..533b8faa4110c5e73416326ea51125ada7e88926 100644
--- a/ui/events/platform/x11/BUILD.gn
+++ b/ui/events/platform/x11/BUILD.gn
@@ -3,8 +3,9 @@
# found in the LICENSE file.
import("//build/config/ui.gni")
+import("//ui/ozone/ozone.gni")
-assert(use_x11)
+assert(use_x11 || ozone_platform_x11)
component("x11") {
output_name = "x11_events_platform"
@@ -12,8 +13,6 @@ component("x11") {
sources = [
"x11_event_source.cc",
"x11_event_source.h",
- "x11_event_source_glib.cc",
- "x11_event_source_libevent.cc",
"x11_hotplug_event_handler.cc",
"x11_hotplug_event_handler.h",
]
@@ -27,6 +26,7 @@ component("x11") {
"//ui/events:events_base",
"//ui/events/devices",
"//ui/events/platform",
+ "//ui/events/x",
"//ui/gfx/x",
]
@@ -34,11 +34,17 @@ component("x11") {
"//base",
]
- if (is_linux) {
- sources -= [ "x11_event_source_libevent.cc" ]
+ if (is_linux && !ozone_platform_x11) {
+ sources += [
+ "x11_event_source_glib.cc",
+ "x11_event_source_glib.h",
+ ]
configs += [ "//build/config/linux:glib" ]
} else {
- sources -= [ "x11_event_source_glib.cc" ]
+ sources += [
+ "x11_event_source_ozone.cc",
+ "x11_event_source_ozone.h",
+ ]
}
}

Powered by Google App Engine
This is Rietveld 408576698