Split out mojo_converters into its own target.

mojo/mojo_surface_converters.gyp

Index: mojo/mojo_surface_converters.gyp
diff --git a/mojo/mojo_converters.gypi b/mojo/mojo_surface_converters.gyp
similarity index 53%
rename from mojo/mojo_converters.gypi
rename to mojo/mojo_surface_converters.gyp
index c6d91ddf0a4a980abc6c49751314605dfcfd652d..f533ed5a507a494e3cb18ffa57a7018e496c6948 100644
--- a/mojo/mojo_converters.gypi
+++ b/mojo/mojo_surface_converters.gyp
@@ -3,69 +3,11 @@
 # found in the LICENSE file.
 
 {
+  'includes': [
+    'mojo_variables.gypi',
+  ],
   'targets': [
     {
-      # GN version: //mojo/converters/input_events
-      'target_name': 'mojo_input_events_lib',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_INPUT_EVENTS_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../ui/events/events.gyp:events',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_geometry_lib',
-        'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
-        'services/public/mojo_services_public.gyp:mojo_input_events_bindings',
-        '<(mojo_system_for_component)',
-      ],
-      'sources': [
-        'converters/input_events/input_events_type_converters.cc',
-        'converters/input_events/input_events_type_converters.h',
-        'converters/input_events/mojo_extended_key_event_data.cc',
-        'converters/input_events/mojo_extended_key_event_data.h',
-        'converters/input_events/mojo_input_events_export.h',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            'mojo_base.gyp:mojo_environment_chromium',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/converters/geometry
-      'target_name': 'mojo_geometry_lib',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_GEOMETRY_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../skia/skia.gyp:skia',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
-        '<(mojo_system_for_component)',
-      ],
-      'export_dependent_settings': [
-        '../ui/gfx/gfx.gyp:gfx',
-      ],
-      'sources': [
-        'converters/geometry/geometry_type_converters.cc',
-        'converters/geometry/geometry_type_converters.h',
-        'converters/geometry/mojo_geometry_export.h',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            'mojo_base.gyp:mojo_environment_chromium',
-          ],
-        }],
-      ],
-    },
-    {
       # GN version: //mojo/converters/surfaces
       'target_name': 'mojo_surfaces_lib',
       'type': '<(component)',
@@ -80,13 +22,13 @@
         '../gpu/gpu.gyp:gpu',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
-        'mojo_geometry_lib',
+        'mojo_geometry_converters.gyp:mojo_geometry_lib',
         'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
         'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
         '<(mojo_system_for_component)',
       ],
       'export_dependent_settings': [
-        'mojo_geometry_lib',
+        'mojo_geometry_converters.gyp:mojo_geometry_lib',
         'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
       ],
       'sources': [
@@ -121,7 +63,7 @@
         '../ui/gfx/gfx.gyp:gfx_test_support',
         'edk/mojo_edk.gyp:mojo_run_all_unittests',
         'mojo_base.gyp:mojo_environment_chromium',
-        'mojo_geometry_lib',
+        'mojo_geometry_converters.gyp:mojo_geometry_lib',
         'mojo_surfaces_lib',
         'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
       ],