Index: ui/events/events.gyp |
diff --git a/ui/events/events.gyp b/ui/events/events.gyp |
index eb11794f97821e56e2a802eed36fe5dd5c86d055..6770cf600ccfeb6be7136571208705ce85c601fa 100644 |
--- a/ui/events/events.gyp |
+++ b/ui/events/events.gyp |
@@ -8,19 +8,47 @@ |
}, |
'targets': [ |
{ |
+ 'target_name': 'events_base', |
+ 'type': '<(component)', |
+ 'dependencies': [ |
+ '<(DEPTH)/base/base.gyp:base', |
+ ], |
+ 'defines': [ |
+ 'EVENTS_BASE_IMPLEMENTATION', |
+ ], |
+ 'sources': [ |
+ 'events_base_export.h', |
+ 'event_switches.cc', |
+ 'event_switches.h', |
+ 'keycodes/keyboard_code_conversion.cc', |
+ 'keycodes/keyboard_code_conversion.h', |
+ 'keycodes/keyboard_code_conversion_android.cc', |
+ 'keycodes/keyboard_code_conversion_android.h', |
+ 'keycodes/keyboard_code_conversion_gtk.cc', |
+ 'keycodes/keyboard_code_conversion_gtk.h', |
+ 'keycodes/keyboard_code_conversion_mac.h', |
+ 'keycodes/keyboard_code_conversion_mac.mm', |
+ 'keycodes/keyboard_code_conversion_win.cc', |
+ 'keycodes/keyboard_code_conversion_win.h', |
+ 'keycodes/keyboard_code_conversion_x.cc', |
+ 'keycodes/keyboard_code_conversion_x.h', |
+ 'keycodes/keyboard_codes.h', |
+ 'latency_info.cc', |
+ 'latency_info.h', |
+ ], |
+ }, |
+ { |
'target_name': 'events', |
'type': '<(component)', |
'dependencies': [ |
'<(DEPTH)/base/base.gyp:base', |
- '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations', |
- '<(DEPTH)/skia/skia.gyp:skia', |
'../gfx/gfx.gyp:gfx', |
+ 'events_base', |
], |
'defines': [ |
'EVENTS_IMPLEMENTATION', |
], |
'sources': [ |
- 'cocoa/events_mac.mm', |
'event.cc', |
'event.h', |
'event_constants.h', |
@@ -28,13 +56,12 @@ |
'event_dispatcher.h', |
'event_handler.cc', |
'event_handler.h', |
- 'event_switches.cc', |
- 'event_switches.h', |
'event_target.cc', |
'event_target.h', |
'event_utils.cc', |
'event_utils.h', |
'events_export.h', |
+ 'events_stub.cc', |
'gestures/gesture_configuration.cc', |
'gestures/gesture_configuration.h', |
'gestures/gesture_point.cc', |
@@ -50,21 +77,6 @@ |
'gestures/gesture_util.h', |
'gestures/velocity_calculator.cc', |
'gestures/velocity_calculator.h', |
- 'keycodes/keyboard_code_conversion.cc', |
- 'keycodes/keyboard_code_conversion.h', |
- 'keycodes/keyboard_code_conversion_android.cc', |
- 'keycodes/keyboard_code_conversion_android.h', |
- 'keycodes/keyboard_code_conversion_gtk.cc', |
- 'keycodes/keyboard_code_conversion_gtk.h', |
- 'keycodes/keyboard_code_conversion_mac.h', |
- 'keycodes/keyboard_code_conversion_mac.mm', |
- 'keycodes/keyboard_code_conversion_win.cc', |
- 'keycodes/keyboard_code_conversion_win.h', |
- 'keycodes/keyboard_code_conversion_x.cc', |
- 'keycodes/keyboard_code_conversion_x.h', |
- 'keycodes/keyboard_codes.h', |
- 'latency_info.cc', |
- 'latency_info.h', |
'ozone/evdev/event_factory.cc', |
'ozone/evdev/event_factory.h', |
'ozone/evdev/event_modifiers.cc', |
@@ -90,25 +102,11 @@ |
'x/touch_factory_x11.h', |
], |
'conditions': [ |
- ['use_aura==0 and toolkit_views==0', { |
- 'sources/': [ |
- ['exclude', '^gestures/*'], |
- ], |
- 'sources!': [ |
- 'event.cc', |
- 'event.h', |
- 'event_dispatcher.cc', |
- 'event_dispatcher.h', |
- 'event_handler.cc', |
- 'event_handler.h', |
- 'event_target.cc', |
- 'event_target.h', |
- ], |
- }], |
- ['OS=="android"', { |
+ # We explicitly enumerate the platforms we _do_ provide native cracking |
+ # for here. |
+ ['OS=="win" or use_x11==1 or use_ozone==1', { |
'sources!': [ |
- 'event_utils.cc', |
- 'keycodes/keyboard_code_conversion.cc', |
+ 'events_stub.cc', |
], |
}], |
['use_x11==1', { |