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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/events/ozone/BUILD.gn

Issue 1460013003: Re-land "Flip 'Linux x64' bot on chromium waterfall to GN." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update perf_expectations again Created 5 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 | « tools/perf_expectations/perf_expectations.json ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/ozone/BUILD.gn
diff --git a/ui/events/ozone/BUILD.gn b/ui/events/ozone/BUILD.gn
index a110fb3dfb58c8f4417868aa6302dcda222fc486..c30ba34ae5ab361f096555026c063ade83079451 100644
--- a/ui/events/ozone/BUILD.gn
+++ b/ui/events/ozone/BUILD.gn
@@ -17,151 +17,153 @@ if (use_xkbcommon) {
}
}
-component("events_ozone") {
- sources = [
- "chromeos/cursor_controller.cc",
- "chromeos/cursor_controller.h",
- "device/device_event.cc",
- "device/device_event.h",
- "device/device_event_observer.h",
- "device/device_manager.cc",
- "device/device_manager.h",
- "device/device_manager_manual.cc",
- "device/device_manager_manual.h",
- "device/udev/device_manager_udev.cc",
- "device/udev/device_manager_udev.h",
- "events_ozone_export.h",
- ]
-
- deps = [
- "//base",
- "//base/third_party/dynamic_annotations",
- "//ui/events",
- "//ui/events:events_base",
- ]
-
- defines = [ "EVENTS_OZONE_IMPLEMENTATION" ]
-
- if (!use_udev) {
- sources -= [
+if (use_ozone) {
+ component("events_ozone") {
+ sources = [
+ "chromeos/cursor_controller.cc",
+ "chromeos/cursor_controller.h",
+ "device/device_event.cc",
+ "device/device_event.h",
+ "device/device_event_observer.h",
+ "device/device_manager.cc",
+ "device/device_manager.h",
+ "device/device_manager_manual.cc",
+ "device/device_manager_manual.h",
"device/udev/device_manager_udev.cc",
"device/udev/device_manager_udev.h",
+ "events_ozone_export.h",
]
- }
- if (use_ozone && use_udev) {
- deps += [ "//device/udev_linux" ]
- }
-}
+ deps = [
+ "//base",
+ "//base/third_party/dynamic_annotations",
+ "//ui/events",
+ "//ui/events:events_base",
+ ]
-config("evdev") {
- defines = [ "USE_EVDEV" ]
-}
+ defines = [ "EVENTS_OZONE_IMPLEMENTATION" ]
-config("evdev_gestures") {
- defines = [ "USE_EVDEV_GESTURES" ]
-}
+ if (!use_udev) {
+ sources -= [
+ "device/udev/device_manager_udev.cc",
+ "device/udev/device_manager_udev.h",
+ ]
+ }
-if (use_evdev_gestures) {
- pkg_config("libevdev-cros") {
- packages = [ "libevdev-cros" ]
+ if (use_ozone && use_udev) {
+ deps += [ "//device/udev_linux" ]
+ }
}
- pkg_config("libgestures") {
- packages = [ "libgestures" ]
+ config("evdev") {
+ defines = [ "USE_EVDEV" ]
}
-}
-
-component("events_ozone_evdev") {
- sources = [
- "evdev/device_event_dispatcher_evdev.cc",
- "evdev/device_event_dispatcher_evdev.h",
- "evdev/event_converter_evdev.cc",
- "evdev/event_converter_evdev.h",
- "evdev/event_converter_evdev_impl.cc",
- "evdev/event_converter_evdev_impl.h",
- "evdev/event_device_info.cc",
- "evdev/event_device_info.h",
- "evdev/event_factory_evdev.cc",
- "evdev/event_factory_evdev.h",
- "evdev/event_modifiers_evdev.cc",
- "evdev/event_modifiers_evdev.h",
- "evdev/event_thread_evdev.cc",
- "evdev/event_thread_evdev.h",
- "evdev/events_ozone_evdev_export.h",
- "evdev/input_controller_evdev.cc",
- "evdev/input_controller_evdev.h",
- "evdev/input_device_factory_evdev.cc",
- "evdev/input_device_factory_evdev.h",
- "evdev/input_device_factory_evdev_proxy.cc",
- "evdev/input_device_factory_evdev_proxy.h",
- "evdev/input_device_settings_evdev.cc",
- "evdev/input_device_settings_evdev.h",
- "evdev/input_injector_evdev.cc",
- "evdev/input_injector_evdev.h",
- "evdev/keyboard_evdev.cc",
- "evdev/keyboard_evdev.h",
- "evdev/keyboard_util_evdev.cc",
- "evdev/keyboard_util_evdev.h",
- "evdev/mouse_button_map_evdev.cc",
- "evdev/mouse_button_map_evdev.h",
- "evdev/tablet_event_converter_evdev.cc",
- "evdev/tablet_event_converter_evdev.h",
- "evdev/touch_evdev_debug_buffer.cc",
- "evdev/touch_evdev_debug_buffer.h",
- "evdev/touch_evdev_types.cc",
- "evdev/touch_evdev_types.h",
- "evdev/touch_event_converter_evdev.cc",
- "evdev/touch_event_converter_evdev.h",
- "evdev/touch_noise/far_apart_taps_touch_noise_filter.cc",
- "evdev/touch_noise/far_apart_taps_touch_noise_filter.h",
- "evdev/touch_noise/horizontally_aligned_touch_noise_filter.cc",
- "evdev/touch_noise/horizontally_aligned_touch_noise_filter.h",
- "evdev/touch_noise/single_position_touch_noise_filter.cc",
- "evdev/touch_noise/single_position_touch_noise_filter.h",
- "evdev/touch_noise/touch_noise_filter.h",
- "evdev/touch_noise/touch_noise_finder.cc",
- "evdev/touch_noise/touch_noise_finder.h",
- ]
- defines = [ "EVENTS_OZONE_EVDEV_IMPLEMENTATION" ]
+ config("evdev_gestures") {
+ defines = [ "USE_EVDEV_GESTURES" ]
+ }
- deps = [
- ":events_ozone",
- ":events_ozone_layout",
- "//base",
- "//ui/events",
- "//ui/events:dom_keycode_converter",
- "//ui/events:events_base",
- "//ui/events/devices",
- "//ui/events/platform",
- "//ui/gfx",
- ]
+ if (use_evdev_gestures) {
+ pkg_config("libevdev-cros") {
+ packages = [ "libevdev-cros" ]
+ }
- public_configs = [ ":evdev" ]
+ pkg_config("libgestures") {
+ packages = [ "libgestures" ]
+ }
+ }
- if (use_ozone && use_evdev_gestures) {
- sources += [
- "evdev/libgestures_glue/event_reader_libevdev_cros.cc",
- "evdev/libgestures_glue/event_reader_libevdev_cros.h",
- "evdev/libgestures_glue/gesture_feedback.cc",
- "evdev/libgestures_glue/gesture_feedback.h",
- "evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc",
- "evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h",
- "evdev/libgestures_glue/gesture_logging.cc",
- "evdev/libgestures_glue/gesture_logging.h",
- "evdev/libgestures_glue/gesture_property_provider.cc",
- "evdev/libgestures_glue/gesture_property_provider.h",
- "evdev/libgestures_glue/gesture_timer_provider.cc",
- "evdev/libgestures_glue/gesture_timer_provider.h",
+ component("events_ozone_evdev") {
+ sources = [
+ "evdev/device_event_dispatcher_evdev.cc",
+ "evdev/device_event_dispatcher_evdev.h",
+ "evdev/event_converter_evdev.cc",
+ "evdev/event_converter_evdev.h",
+ "evdev/event_converter_evdev_impl.cc",
+ "evdev/event_converter_evdev_impl.h",
+ "evdev/event_device_info.cc",
+ "evdev/event_device_info.h",
+ "evdev/event_factory_evdev.cc",
+ "evdev/event_factory_evdev.h",
+ "evdev/event_modifiers_evdev.cc",
+ "evdev/event_modifiers_evdev.h",
+ "evdev/event_thread_evdev.cc",
+ "evdev/event_thread_evdev.h",
+ "evdev/events_ozone_evdev_export.h",
+ "evdev/input_controller_evdev.cc",
+ "evdev/input_controller_evdev.h",
+ "evdev/input_device_factory_evdev.cc",
+ "evdev/input_device_factory_evdev.h",
+ "evdev/input_device_factory_evdev_proxy.cc",
+ "evdev/input_device_factory_evdev_proxy.h",
+ "evdev/input_device_settings_evdev.cc",
+ "evdev/input_device_settings_evdev.h",
+ "evdev/input_injector_evdev.cc",
+ "evdev/input_injector_evdev.h",
+ "evdev/keyboard_evdev.cc",
+ "evdev/keyboard_evdev.h",
+ "evdev/keyboard_util_evdev.cc",
+ "evdev/keyboard_util_evdev.h",
+ "evdev/mouse_button_map_evdev.cc",
+ "evdev/mouse_button_map_evdev.h",
+ "evdev/tablet_event_converter_evdev.cc",
+ "evdev/tablet_event_converter_evdev.h",
+ "evdev/touch_evdev_debug_buffer.cc",
+ "evdev/touch_evdev_debug_buffer.h",
+ "evdev/touch_evdev_types.cc",
+ "evdev/touch_evdev_types.h",
+ "evdev/touch_event_converter_evdev.cc",
+ "evdev/touch_event_converter_evdev.h",
+ "evdev/touch_noise/far_apart_taps_touch_noise_filter.cc",
+ "evdev/touch_noise/far_apart_taps_touch_noise_filter.h",
+ "evdev/touch_noise/horizontally_aligned_touch_noise_filter.cc",
+ "evdev/touch_noise/horizontally_aligned_touch_noise_filter.h",
+ "evdev/touch_noise/single_position_touch_noise_filter.cc",
+ "evdev/touch_noise/single_position_touch_noise_filter.h",
+ "evdev/touch_noise/touch_noise_filter.h",
+ "evdev/touch_noise/touch_noise_finder.cc",
+ "evdev/touch_noise/touch_noise_finder.h",
]
- public_configs += [ ":evdev_gestures" ]
-
- configs += [
- ":libevdev-cros",
- ":libgestures",
+ defines = [ "EVENTS_OZONE_EVDEV_IMPLEMENTATION" ]
+
+ deps = [
+ ":events_ozone",
+ ":events_ozone_layout",
+ "//base",
+ "//ui/events",
+ "//ui/events:dom_keycode_converter",
+ "//ui/events:events_base",
+ "//ui/events/devices",
+ "//ui/events/platform",
+ "//ui/gfx",
]
+
+ public_configs = [ ":evdev" ]
+
+ if (use_ozone && use_evdev_gestures) {
+ sources += [
+ "evdev/libgestures_glue/event_reader_libevdev_cros.cc",
+ "evdev/libgestures_glue/event_reader_libevdev_cros.h",
+ "evdev/libgestures_glue/gesture_feedback.cc",
+ "evdev/libgestures_glue/gesture_feedback.h",
+ "evdev/libgestures_glue/gesture_interpreter_libevdev_cros.cc",
+ "evdev/libgestures_glue/gesture_interpreter_libevdev_cros.h",
+ "evdev/libgestures_glue/gesture_logging.cc",
+ "evdev/libgestures_glue/gesture_logging.h",
+ "evdev/libgestures_glue/gesture_property_provider.cc",
+ "evdev/libgestures_glue/gesture_property_provider.h",
+ "evdev/libgestures_glue/gesture_timer_provider.cc",
+ "evdev/libgestures_glue/gesture_timer_provider.h",
+ ]
+
+ public_configs += [ ":evdev_gestures" ]
+
+ configs += [
+ ":libevdev-cros",
+ ":libgestures",
+ ]
+ }
}
}
« no previous file with comments | « tools/perf_expectations/perf_expectations.json ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698