Revert "Move geometry to mojo/services, extract input events to their own mojom"

mojo/mojo_services.gypi

Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 599a28f56a2b8e485e812276c17cc1e9ee2943dd..b0536054b8f06a743900302c5b557159e4d9c0d2 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -18,57 +18,6 @@
       ],
     },
     {
-      'target_name': 'mojo_input_events_bindings',
-      'type': 'static_library',
-      'sources': [
-        'services/public/interfaces/input_events/input_events.mojom',
-      ],
-      'variables': {
-        'mojom_base_output_dir': 'mojo',
-      },
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-      'dependencies': [
-        'mojo_cpp_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_geometry_bindings',
-      'type': 'static_library',
-      'sources': [
-        'services/public/interfaces/geometry/geometry.mojom',
-      ],
-      'variables': {
-        'mojom_base_output_dir': 'mojo',
-      },
-      'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
-      'dependencies': [
-        'mojo_cpp_bindings',
-      ],
-      'export_dependent_settings': [
-        'mojo_cpp_bindings',
-      ],
-    },
-    {
-      'target_name': 'mojo_geometry_lib',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_GEOMETRY_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_environment_chromium',
-        'mojo_geometry_bindings',
-        'mojo_system_impl',
-      ],
-      'sources': [
-        'services/public/cpp/geometry/lib/geometry_type_converters.cc',
-        'services/public/cpp/geometry/geometry_type_converters.h',
-      ],
-    },
-    {
       'target_name': 'mojo_gles2_bindings',
       'type': 'static_library',
       'sources': [
@@ -124,7 +73,6 @@
       ],
       'dependencies': [
         'mojo_geometry_bindings',
-        'mojo_input_events_bindings',
         'mojo_cpp_bindings',
       ],
     },