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..8e21f117c549a421971b0191e37a2581190855a7 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) { |
sadrul
2016/02/08 17:28:32
Check use_glib flag instead?
kylechar
2016/02/08 19:08:09
Done.
|
+ 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_libevent.cc", |
+ "x11_event_source_libevent.h", |
+ ] |
} |
} |