Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / ui / events / events.gyp

diff --git a/src/ui/events/events.gyp b/src/ui/events/events.gyp
index 113300d..8887657 100644 (file)
--- a/src/ui/events/events.gyp
+++ b/src/ui/events/events.gyp
@@ -112,18 +112,22 @@
         'gestures/gesture_types.h',
         'gestures/velocity_calculator.cc',
         'gestures/velocity_calculator.h',
+        'ozone/evdev/device_manager_evdev.cc',
+        'ozone/evdev/device_manager_evdev.h',
+        'ozone/evdev/device_manager_udev.cc',
+        'ozone/evdev/device_manager_udev.h',
+        'ozone/evdev/event_converter_evdev.cc',
+        'ozone/evdev/event_converter_evdev.h',
         'ozone/evdev/event_device_info.cc',
         'ozone/evdev/event_device_info.h',
-        'ozone/evdev/event_factory.cc',
-        'ozone/evdev/event_factory.h',
-        'ozone/evdev/event_modifiers.cc',
-        'ozone/evdev/event_modifiers.h',
-        'ozone/evdev/key_event_converter.cc',
-        'ozone/evdev/key_event_converter.h',
-        'ozone/evdev/touch_event_converter.cc',
-        'ozone/evdev/touch_event_converter.h',
-        'ozone/event_converter_ozone.cc',
-        'ozone/event_converter_ozone.h',
+        'ozone/evdev/event_factory_evdev.cc',
+        'ozone/evdev/event_factory_evdev.h',
+        'ozone/evdev/event_modifiers_evdev.cc',
+        'ozone/evdev/event_modifiers_evdev.h',
+        'ozone/evdev/key_event_converter_evdev.cc',
+        'ozone/evdev/key_event_converter_evdev.h',
+        'ozone/evdev/touch_event_converter_evdev.cc',
+        'ozone/evdev/touch_event_converter_evdev.h',
         'ozone/event_factory_ozone.cc',
         'ozone/event_factory_ozone.h',
         'ozone/events_ozone.cc',
@@ -146,6 +150,17 @@
         ['use_ozone_evdev==1', {
           'defines': ['USE_OZONE_EVDEV=1'],
         }],
+        ['use_ozone_evdev==1 and use_udev==1', {
+          'dependencies': [
+            '<(DEPTH)/build/linux/system.gyp:udev',
+          ],
+        }],
+        ['use_udev==0', {
+          'sources!': [
+            'ozone/evdev/device_manager_udev.cc',
+            'ozone/evdev/device_manager_udev.h',
+          ],
+        }],
       ],
     },
     {
@@ -156,6 +171,8 @@
         'events_base',
       ],
       'sources': [
+        'test/cocoa_test_event_utils.h',
+        'test/cocoa_test_event_utils.mm',
         'test/events_test_utils.cc',
         'test/events_test_utils.h',
         'test/events_test_utils_x11.cc',
@@ -171,6 +188,10 @@
             '<(DEPTH)/build/linux/system.gyp:x11',
           ],
         }],
+        ['OS=="ios"', {
+          # The cocoa files don't apply to iOS.
+          'sources/': [['exclude', 'cocoa']],
+        }],
       ],
     },
     {
@@ -195,8 +216,8 @@
         'gestures/velocity_calculator_unittest.cc',
         'keycodes/dom4/keycode_converter_unittest.cc',
         'latency_info_unittest.cc',
-        'ozone/evdev/key_event_converter_unittest.cc',
-        'ozone/evdev/touch_event_converter_unittest.cc',
+        'ozone/evdev/key_event_converter_evdev_unittest.cc',
+        'ozone/evdev/touch_event_converter_evdev_unittest.cc',
         'x/events_x_unittest.cc',
       ],
       'conditions': [