Chromium Code Reviews| Index: ui/events/BUILD.gn |
| diff --git a/ui/events/BUILD.gn b/ui/events/BUILD.gn |
| index cb4738c294af62659232856458f5eb95c11b65a8..0ad083ddafc913dc200bd33a145eab4dc1d03669 100644 |
| --- a/ui/events/BUILD.gn |
| +++ b/ui/events/BUILD.gn |
| @@ -35,13 +35,18 @@ static_library("dom_keycode_converter") { |
| } |
| } |
| +source_set("event_constants") { |
| + sources = [ |
| + "event_constants.h", |
| + ] |
| +} |
| + |
| component("events_base") { |
| sources = [ |
| "android/scroller.cc", |
| "android/scroller.h", |
| "base_event_utils.cc", |
| "base_event_utils.h", |
| - "event_constants.h", |
| "event_switches.cc", |
| "event_switches.h", |
| "events_base_export.h", |
| @@ -72,6 +77,7 @@ component("events_base") { |
| public_deps = [ |
| ":dom_keycode_converter", |
| + ":event_constants", |
|
Eugene But (OOO till 7-30)
2016/12/09 02:31:32
ios needs one header from events (event_constants.
|
| "//base", |
| "//ui/events/platform", |
| "//ui/gfx/geometry", |
| @@ -345,140 +351,142 @@ static_library("test_support") { |
| } |
| } |
| -test("events_unittests") { |
| - sources = [ |
| - "android/scroller_unittest.cc", |
| - "cocoa/events_mac_unittest.mm", |
| - "event_dispatcher_unittest.cc", |
| - "event_processor_unittest.cc", |
| - "event_rewriter_unittest.cc", |
| - "event_unittest.cc", |
| - "gesture_detection/bitset_32_unittest.cc", |
| - "gesture_detection/filtered_gesture_provider_unittest.cc", |
| - "gesture_detection/gesture_event_data_packet_unittest.cc", |
| - "gesture_detection/gesture_provider_unittest.cc", |
| - "gesture_detection/motion_event_buffer_unittest.cc", |
| - "gesture_detection/motion_event_generic_unittest.cc", |
| - "gesture_detection/snap_scroll_controller_unittest.cc", |
| - "gesture_detection/touch_disposition_gesture_filter_unittest.cc", |
| - "gesture_detection/velocity_tracker_unittest.cc", |
| - "gestures/fling_curve_unittest.cc", |
| - "keycodes/dom/keycode_converter_unittest.cc", |
| - "keycodes/keyboard_code_conversion_unittest.cc", |
| - "keycodes/platform_key_map_win_unittest.cc", |
| - "latency_info_unittest.cc", |
| - "platform/platform_event_source_unittest.cc", |
| - "scoped_target_handler_unittest.cc", |
| - "win/event_utils_win_unittest.cc", |
| - ] |
| - |
| - deps = [ |
| - ":dom_keycode_converter", |
| - ":events", |
| - ":events_base", |
| - ":gesture_detection", |
| - ":test_support", |
| - "//base", |
| - "//base/test:test_support", |
| - "//mojo/edk/test:run_all_unittests", |
| - "//skia", |
| - "//testing/gmock", |
| - "//testing/gtest", |
| - "//ui/events/devices", |
| - "//ui/events/platform", |
| - "//ui/gfx:test_support", |
| - ] |
| - |
| - if (!is_ios) { |
| - sources += [ |
| - "blink/blink_event_util_unittest.cc", |
| - "blink/input_handler_proxy_unittest.cc", |
| - "blink/input_scroll_elasticity_controller_unittest.cc", |
| - "blink/web_input_event_traits_unittest.cc", |
| - "blink/web_input_event_unittest.cc", |
| - "devices/mojo/device_struct_traits_unittest.cc", |
| - "gestures/blink/web_gesture_curve_impl_unittest.cc", |
| - "ipc/latency_info_param_traits_unittest.cc", |
| - "mojo/struct_traits_unittest.cc", |
| +if (!is_ios) { |
| + test("events_unittests") { |
|
Eugene But (OOO till 7-30)
2016/12/09 02:31:32
These are just indentations.
|
| + sources = [ |
| + "android/scroller_unittest.cc", |
| + "cocoa/events_mac_unittest.mm", |
| + "event_dispatcher_unittest.cc", |
| + "event_processor_unittest.cc", |
| + "event_rewriter_unittest.cc", |
| + "event_unittest.cc", |
| + "gesture_detection/bitset_32_unittest.cc", |
| + "gesture_detection/filtered_gesture_provider_unittest.cc", |
| + "gesture_detection/gesture_event_data_packet_unittest.cc", |
| + "gesture_detection/gesture_provider_unittest.cc", |
| + "gesture_detection/motion_event_buffer_unittest.cc", |
| + "gesture_detection/motion_event_generic_unittest.cc", |
| + "gesture_detection/snap_scroll_controller_unittest.cc", |
| + "gesture_detection/touch_disposition_gesture_filter_unittest.cc", |
| + "gesture_detection/velocity_tracker_unittest.cc", |
| + "gestures/fling_curve_unittest.cc", |
| + "keycodes/dom/keycode_converter_unittest.cc", |
| + "keycodes/keyboard_code_conversion_unittest.cc", |
| + "keycodes/platform_key_map_win_unittest.cc", |
| + "latency_info_unittest.cc", |
| + "platform/platform_event_source_unittest.cc", |
| + "scoped_target_handler_unittest.cc", |
| + "win/event_utils_win_unittest.cc", |
| ] |
| - deps += [ |
| - "//cc", |
| - "//ipc:test_support", |
| - "//mojo/public/cpp/bindings", |
| - "//third_party/WebKit/public:blink_headers", |
| - "//ui/display", |
| - "//ui/events/blink", |
| - "//ui/events/devices/mojo:test_interfaces", |
| - "//ui/events/gestures/blink", |
| - "//ui/events/ipc", |
| - "//ui/events/mojo:test_interfaces", |
| - "//ui/gfx/ipc/geometry", |
| - ] |
| - } |
| - if (!is_android && !is_ios) { |
| - data_deps = [ |
| - "//third_party/mesa:osmesa", |
| + deps = [ |
| + ":dom_keycode_converter", |
| + ":events", |
| + ":events_base", |
| + ":gesture_detection", |
| + ":test_support", |
| + "//base", |
| + "//base/test:test_support", |
| + "//mojo/edk/test:run_all_unittests", |
| + "//skia", |
| + "//testing/gmock", |
| + "//testing/gtest", |
| + "//ui/events/devices", |
| + "//ui/events/platform", |
| + "//ui/gfx:test_support", |
| ] |
| - } |
| - if (use_x11) { |
| - sources += [ |
| - "devices/x11/device_data_manager_x11_unittest.cc", |
| - "x/events_x_unittest.cc", |
| - ] |
| - configs += [ "//build/config/linux:x11" ] |
| - deps += [ |
| - "//ui/events/devices/x11", |
| - "//ui/events/x", |
| - "//ui/gfx/x", |
| - ] |
| - } |
| + if (!is_ios) { |
| + sources += [ |
| + "blink/blink_event_util_unittest.cc", |
| + "blink/input_handler_proxy_unittest.cc", |
| + "blink/input_scroll_elasticity_controller_unittest.cc", |
| + "blink/web_input_event_traits_unittest.cc", |
| + "blink/web_input_event_unittest.cc", |
| + "devices/mojo/device_struct_traits_unittest.cc", |
| + "gestures/blink/web_gesture_curve_impl_unittest.cc", |
| + "ipc/latency_info_param_traits_unittest.cc", |
| + "mojo/struct_traits_unittest.cc", |
| + ] |
| + deps += [ |
| + "//cc", |
| + "//ipc:test_support", |
| + "//mojo/public/cpp/bindings", |
| + "//third_party/WebKit/public:blink_headers", |
| + "//ui/display", |
| + "//ui/events/blink", |
| + "//ui/events/devices/mojo:test_interfaces", |
| + "//ui/events/gestures/blink", |
| + "//ui/events/ipc", |
| + "//ui/events/mojo:test_interfaces", |
| + "//ui/gfx/ipc/geometry", |
| + ] |
| + } |
| - if (use_ozone) { |
| - sources += [ |
| - "ozone/chromeos/cursor_controller_unittest.cc", |
| - "ozone/evdev/event_converter_evdev_impl_unittest.cc", |
| - "ozone/evdev/event_converter_test_util.cc", |
| - "ozone/evdev/event_device_info_unittest.cc", |
| - "ozone/evdev/event_device_test_util.cc", |
| - "ozone/evdev/input_injector_evdev_unittest.cc", |
| - "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", |
| - ] |
| + if (!is_android && !is_ios) { |
| + data_deps = [ |
| + "//third_party/mesa:osmesa", |
| + ] |
| + } |
| - if (use_xkbcommon) { |
| + if (use_x11) { |
| sources += [ |
| - "ozone/layout/keyboard_layout_engine_unittest.cc", |
| - "ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc", |
| + "devices/x11/device_data_manager_x11_unittest.cc", |
| + "x/events_x_unittest.cc", |
| + ] |
| + configs += [ "//build/config/linux:x11" ] |
| + deps += [ |
| + "//ui/events/devices/x11", |
| + "//ui/events/x", |
| + "//ui/gfx/x", |
| ] |
| } |
| - deps += [ |
| - "//ui/events/ozone:events_ozone", |
| - "//ui/events/ozone:events_ozone_evdev", |
| - "//ui/events/ozone:events_ozone_layout", |
| - ] |
| - } |
| + if (use_ozone) { |
| + sources += [ |
| + "ozone/chromeos/cursor_controller_unittest.cc", |
| + "ozone/evdev/event_converter_evdev_impl_unittest.cc", |
| + "ozone/evdev/event_converter_test_util.cc", |
| + "ozone/evdev/event_device_info_unittest.cc", |
| + "ozone/evdev/event_device_test_util.cc", |
| + "ozone/evdev/input_injector_evdev_unittest.cc", |
| + "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", |
| + ] |
| - if (use_aura) { |
| - sources += [ |
| - "gestures/gesture_provider_aura_unittest.cc", |
| - "gestures/motion_event_aura_unittest.cc", |
| - ] |
| - } |
| + if (use_xkbcommon) { |
| + sources += [ |
| + "ozone/layout/keyboard_layout_engine_unittest.cc", |
| + "ozone/layout/xkb/xkb_keyboard_layout_engine_unittest.cc", |
| + ] |
| + } |
| + |
| + deps += [ |
| + "//ui/events/ozone:events_ozone", |
| + "//ui/events/ozone:events_ozone_evdev", |
| + "//ui/events/ozone:events_ozone_layout", |
| + ] |
| + } |
| - if (is_android) { |
| - sources += [ "android/motion_event_android_unittest.cc" ] |
| - } |
| + if (use_aura) { |
| + sources += [ |
| + "gestures/gesture_provider_aura_unittest.cc", |
| + "gestures/motion_event_aura_unittest.cc", |
| + ] |
| + } |
| - if (is_ios) { |
| - assert_no_deps = ios_assert_no_deps |
| - } |
| + if (is_android) { |
| + sources += [ "android/motion_event_android_unittest.cc" ] |
| + } |
| + |
| + if (is_ios) { |
| + assert_no_deps = ios_assert_no_deps |
| + } |
| - if (is_win) { |
| - sources += [ "blink/web_input_event_builders_win_unittest.cc" ] |
| + if (is_win) { |
| + sources += [ "blink/web_input_event_builders_win_unittest.cc" ] |
| + } |
| } |
| } |