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

Unified Diff: components/exo/BUILD.gn

Issue 2900773003: Allow gaming_seat to use ozone gamepad as back-end (Closed)
Patch Set: Add gaming_seat_ozone to exo Created 3 years, 6 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: components/exo/BUILD.gn
diff --git a/components/exo/BUILD.gn b/components/exo/BUILD.gn
index 1b48931fed87d251ba48649098407a661378b7dc..b30beec8937f2c9815409c98d0897bab528b1d0e 100644
--- a/components/exo/BUILD.gn
+++ b/components/exo/BUILD.gn
@@ -2,6 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import("//chrome/common/features.gni")
import("//build/config/ui.gni")
import("//testing/test.gni")
@@ -13,7 +14,6 @@ source_set("exo") {
"compositor_frame_sink_holder.h",
"display.cc",
"display.h",
- "gaming_seat.cc",
"gaming_seat.h",
"keyboard.cc",
"keyboard.h",
@@ -70,8 +70,13 @@ source_set("exo") {
"//ui/wm",
]
- if (use_ozone) {
+ if (use_ozone && enable_ozone_gamepad_in_exo) {
reveman 2017/06/05 22:48:03 hm, is use_ozone needed? isn't that automatic from
jkwang 2017/06/06 20:03:06 Done.
+ defines = [ "USE_OZONE_GAMEPAD" ]
+ sources += [ "gaming_seat_ozone.cc" ]
deps += [ "//ui/ozone" ]
+ deps += [ "//ui/events/ozone:events_ozone_evdev" ]
+ } else {
+ sources += [ "gaming_seat.cc" ]
}
if (is_chromeos) {
@@ -111,7 +116,6 @@ source_set("unit_tests") {
sources = [
"buffer_unittest.cc",
"display_unittest.cc",
- "gaming_seat_unittest.cc",
"keyboard_unittest.cc",
"pointer_unittest.cc",
"shared_memory_unittest.cc",
@@ -148,8 +152,13 @@ source_set("unit_tests") {
"//ui/wm",
]
- if (use_ozone) {
- deps += [ "//ui/ozone" ]
+ if (use_ozone && enable_ozone_gamepad_in_exo) {
+ sources += [
+ "../../ui/events/ozone/gamepad/gamepad_event.cc",
reveman 2017/06/05 22:48:03 I think you can include this unconditionally when
jkwang 2017/06/06 20:03:06 Won't compile. The test case is specific for one i
+ "gaming_seat_ozone_unittest.cc",
+ ]
+ } else {
+ sources += [ "gaming_seat_unittest.cc" ]
}
}

Powered by Google App Engine
This is Rietveld 408576698