Move mojo/services/public/cpp TypeConverters to mojo/converters.

mojo/mojo_services.gypi

 # Copyright (c) 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       # GN version: //mojo/services/clipboard/
       'target_name': 'mojo_clipboard',
       'type': 'loadable_module',
@@ skipping 147 matching lines @@
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc_surfaces',
         '../skia/skia.gyp:skia',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_base.gyp:mojo_common_lib',
-        'mojo_geometry_lib',
+        'mojo_converters',
         'mojo_gles2_service',
-        'mojo_input_events_lib',
-        'mojo_surfaces_lib',
         'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
         'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
         'services/public/mojo_services_public.gyp:mojo_native_viewport_bindings',
         'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
       ],
       'export_dependent_settings': [
         'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
         'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
         'services/public/mojo_services_public.gyp:mojo_native_viewport_bindings',
         'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
@@ skipping 111 matching lines @@
       # GN version: //mojo/services/surfaces
       'target_name': 'mojo_surfaces_service',
       'type': 'loadable_module',
       'dependencies': [
         '../base/base.gyp:base',
         '../cc/cc.gyp:cc',
         '../cc/cc.gyp:cc_surfaces',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_base.gyp:mojo_application_chromium',
         'mojo_cc_support',
-        'mojo_geometry_lib',
-        'mojo_surfaces_lib',
+        'mojo_converters',
         'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
         'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
         'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
         '<(mojo_system_for_loadable_module)',
       ],
       'includes': [
         'mojo_public_gles2_for_loadable_module.gypi',
       ],
       'sources': [
         'services/surfaces/surfaces_impl.cc',
         'services/surfaces/surfaces_impl.h',
         'services/surfaces/surfaces_service_application.cc',
         'services/surfaces/surfaces_service_application.h',
         'services/surfaces/surfaces_service_impl.cc',
         'services/surfaces/surfaces_service_impl.h',
       ],
     },
     {
       # GN version: //mojo/services/public/cpp/view_manager/tests:mojo_view_manager_lib_unittests
       'target_name': 'mojo_view_manager_lib_unittests',
       'type': 'executable',
       'dependencies': [
         '../base/base.gyp:base',
         '../base/base.gyp:test_support_base',
         '../testing/gtest.gyp:gtest',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         'mojo.gyp:mojo_shell_test_support',
         'mojo_base.gyp:mojo_environment_chromium',
-        'mojo_geometry_lib',
+        'mojo_converters',
         'mojo_view_manager_lib',
         'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
         'services/public/mojo_services_public.gyp:mojo_view_manager_bindings',
       ],
       'sources': [
         'services/public/cpp/view_manager/tests/view_unittest.cc',
         'services/public/cpp/view_manager/tests/view_manager_unittest.cc',
       ],
       'conditions': [
         ['use_aura==1', {
           'dependencies': [
             'mojo_view_manager_run_unittests'
           ],
         }, {  # use_aura==0
           'dependencies': [
             'edk/mojo_edk.gyp:mojo_run_all_unittests',
           ],
         }],
       ],
     },
     {
       # GN version: //mojo/services/public/cpp/view_manager
       'target_name': 'mojo_view_manager_lib',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         'mojo_application_manager',
         'mojo_base.gyp:mojo_application_chromium',
-        'mojo_geometry_lib',
+        'mojo_converters',
         'public/mojo_public.gyp:mojo_application_base',
         'public/mojo_public.gyp:mojo_application_bindings',
         'public/mojo_public.gyp:mojo_cpp_bindings',
         'services/public/mojo_services_public.gyp:mojo_core_window_manager_bindings',
         'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
         'services/public/mojo_services_public.gyp:mojo_input_events_bindings',
         'services/public/mojo_services_public.gyp:mojo_surface_id_bindings',
         'services/public/mojo_services_public.gyp:mojo_view_manager_bindings',
         'services/public/mojo_services_public.gyp:mojo_view_manager_common',
       ],
@@ skipping 75 matching lines @@
         'services/test_service/test_request_tracker_client_impl.cc',
         'services/test_service/test_request_tracker_client_impl.h',
         'services/test_service/test_request_tracker_application.cc',
         'services/test_service/test_request_tracker_application.h',
         'services/test_service/test_time_service_impl.cc',
         'services/test_service/test_time_service_impl.h',
         'services/test_service/test_request_tracker_impl.cc',
         'services/test_service/test_request_tracker_impl.h',
       ],
     },
-    {
-      # GN version: //mojo/services/public/cpp/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': [
-        'services/public/cpp/input_events/lib/input_events_type_converters.cc',
-        'services/public/cpp/input_events/lib/mojo_extended_key_event_data.cc',
-        'services/public/cpp/input_events/lib/mojo_extended_key_event_data.h',
-        'services/public/cpp/input_events/input_events_type_converters.h',
-        'services/public/cpp/input_events/mojo_input_events_export.h',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            'mojo_base.gyp:mojo_environment_chromium',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/services/public/cpp/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': [
-        'services/public/cpp/geometry/lib/geometry_type_converters.cc',
-        'services/public/cpp/geometry/geometry_type_converters.h',
-        'services/public/cpp/geometry/mojo_geometry_export.h',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            'mojo_base.gyp:mojo_environment_chromium',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/services/public/cpp/surfaces
-      'target_name': 'mojo_surfaces_lib',
-      'type': '<(component)',
-      'defines': [
-        'MOJO_SURFACES_IMPLEMENTATION',
-      ],
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../cc/cc.gyp:cc',
-        '../cc/cc.gyp:cc_surfaces',
-        '../skia/skia.gyp:skia',
-        '../gpu/gpu.gyp:gpu',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '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',
-        'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
-      ],
-      'sources': [
-        'services/public/cpp/surfaces/lib/surfaces_type_converters.cc',
-        'services/public/cpp/surfaces/lib/surfaces_utils.cc',
-        'services/public/cpp/surfaces/surfaces_type_converters.h',
-        'services/public/cpp/surfaces/surfaces_utils.h',
-        'services/public/cpp/surfaces/mojo_surfaces_export.h',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            'mojo_base.gyp:mojo_environment_chromium',
-          ],
-        }],
-      ],
-    },
-    {
-      # GN version: //mojo/services/public/cpp/surfaces/tests
-      'target_name': 'mojo_surfaces_lib_unittests',
-      'type': 'executable',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../base/base.gyp:test_support_base',
-        '../cc/cc.gyp:cc',
-        '../cc/cc.gyp:cc_surfaces',
-        '../gpu/gpu.gyp:gpu',
-        '../skia/skia.gyp:skia',
-        '../testing/gtest.gyp:gtest',
-        '../ui/gfx/gfx.gyp:gfx',
-        '../ui/gfx/gfx.gyp:gfx_geometry',
-        '../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_surfaces_lib',
-        'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
-      ],
-      'sources': [
-        'services/public/cpp/surfaces/tests/surface_unittest.cc',
-      ],
-      'conditions': [
-        ['component=="shared_library"', {
-          'dependencies': [
-            'mojo_base.gyp:mojo_environment_chromium',
-          ],
-        }],
-      ],
-    },
   ],
   'conditions': [
     ['use_aura==1', {
       'targets': [
         {
           # GN version: //mojo/services/view_manager
           'target_name': 'mojo_view_manager',
           'type': 'loadable_module',
           'dependencies': [
             '../base/base.gyp:base',
             '../cc/cc.gyp:cc_surfaces',
             '../skia/skia.gyp:skia',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/events/events.gyp:events',
             '../ui/events/events.gyp:events_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_common_lib',
             'mojo_base.gyp:mojo_common_lib',
-            'mojo_geometry_lib',
-            'mojo_input_events_lib',
-            'mojo_surfaces_lib',
+            'mojo_converters',
             'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
             'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
             'services/public/mojo_services_public.gyp:mojo_gpu_bindings',
             'services/public/mojo_services_public.gyp:mojo_input_events_bindings',
             'services/public/mojo_services_public.gyp:mojo_native_viewport_bindings',
             'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
             'services/public/mojo_services_public.gyp:mojo_view_manager_bindings',
             'services/public/mojo_services_public.gyp:mojo_view_manager_common',
             '<(mojo_system_for_loadable_module)',
           ],
@@ skipping 35 matching lines @@
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:test_support_base',
             '../skia/skia.gyp:skia',
             '../testing/gtest.gyp:gtest',
             '../ui/aura/aura.gyp:aura',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             'edk/mojo_edk.gyp:mojo_system_impl',
             'mojo_application_manager',
             'mojo_base.gyp:mojo_application_chromium',
-            'mojo_geometry_lib',
-            'mojo_input_events_lib',
+            'mojo_converters',
             'mojo_shell_test_support',
             'mojo_view_manager_run_unittests',
             'services/public/mojo_services_public.gyp:mojo_geometry_bindings',
             'services/public/mojo_services_public.gyp:mojo_input_events_bindings',
             'services/public/mojo_services_public.gyp:mojo_view_manager_bindings',
             'services/public/mojo_services_public.gyp:mojo_view_manager_common',
             # Included only to force deps for bots.
             'mojo_native_viewport_service',
             'mojo_surfaces_service',
             'mojo_view_manager',
@@ skipping 24 matching lines @@
           'type': 'static_library',
           'dependencies': [
             '../base/base.gyp:base',
             '../ui/base/ui_base.gyp:ui_base',
             '../ui/gfx/gfx.gyp:gfx',
             '../ui/gfx/gfx.gyp:gfx_geometry',
             '../ui/wm/wm.gyp:wm',
             'mojo_aura_support',
             'mojo_base.gyp:mojo_application_chromium',
             'mojo_base.gyp:mojo_common_lib',
-            'mojo_input_events_lib',
+            'mojo_converters',
             'mojo_view_manager_lib',
             'services/public/mojo_services_public.gyp:mojo_core_window_manager_bindings',
           ],
           'sources': [
             'services/window_manager/window_manager_app.cc',
             'services/window_manager/window_manager_app.h',
             'services/window_manager/window_manager_service_impl.cc',
             'services/window_manager/window_manager_service_impl.h',
           ],
         },
@@ skipping 39 matching lines @@
               'dependencies': [
                 '../ui/gfx/x/gfx_x11.gyp:gfx_x11',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }