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

Unified Diff: ui/events/BUILD.gn

Issue 1285183008: Ozone integration. (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: add missing license header Created 5 years, 4 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
« no previous file with comments | « ui/display/util/edid_parser_unittest.cc ('k') | ui/events/event.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/BUILD.gn
diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn
index 536fd6463b30c2a348ebfbe63fd15d1e82fc4faa..19513efada41a9d45b3a997787ca697f1efc3874 100644
--- a/ui/events/BUILD.gn
+++ b/ui/events/BUILD.gn
@@ -4,6 +4,7 @@
import("//build/config/ui.gni")
import("//testing/test.gni")
+import("//ui/events/xkb.gni")
static_library("dom_keycode_converter") {
sources = [
@@ -71,7 +72,7 @@ component("events_base") {
deps += [ "//ui/gfx/x" ]
}
- if (use_x11 || use_ozone) {
+ if (use_x11 || use_xkbcommon) {
sources += [
"keycodes/keyboard_code_conversion_xkb.cc",
"keycodes/keyboard_code_conversion_xkb.h",
@@ -293,6 +294,7 @@ test("events_unittests") {
"//ui/events/devices",
"//ui/events/platform",
"//ui/gfx:test_support",
+ "//testing/gmock:gmock",
]
include_dirs = [ "//testing/gmock/include" ]
@@ -318,8 +320,10 @@ test("events_unittests") {
"ozone/evdev/tablet_event_converter_evdev_unittest.cc",
"ozone/evdev/touch_event_converter_evdev_unittest.cc",
"ozone/evdev/touch_noise/touch_noise_finder_unittest.cc",
- "ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc",
]
+ if (use_x11 || use_xkbcommon) {
+ sources += [ "ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc" ]
+ }
deps += [
"//ui/events/ozone:events_ozone",
"//ui/events/ozone:events_ozone_evdev",
« no previous file with comments | « ui/display/util/edid_parser_unittest.cc ('k') | ui/events/event.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698