| Index: mojo/mojo.gyp
|
| diff --git a/mojo/mojo.gyp b/mojo/mojo.gyp
|
| index 222522459576073a2562070f519d8d8c088102f7..7044f6bbf24ac4b8353ce22f30456ff31e6a5956 100644
|
| --- a/mojo/mojo.gyp
|
| +++ b/mojo/mojo.gyp
|
| @@ -15,6 +15,7 @@
|
| },
|
| 'includes': [
|
| 'mojo_apps.gypi',
|
| + 'mojo_converters.gypi',
|
| 'mojo_examples.gypi',
|
| 'mojo_services.gypi',
|
| 'mojo_variables.gypi',
|
| @@ -34,13 +35,13 @@
|
| 'mojo_clipboard_unittests',
|
| 'mojo_compositor_app',
|
| 'mojo_content_handler_demo',
|
| + 'mojo_converters',
|
| + 'mojo_converters_unittests',
|
| 'mojo_echo_client',
|
| 'mojo_echo_service',
|
| 'mojo_example_apptests',
|
| 'mojo_example_service',
|
| - 'mojo_geometry_lib',
|
| 'mojo_html_viewer',
|
| - 'mojo_input_events_lib',
|
| 'mojo_js_content_handler',
|
| 'mojo_js_standalone',
|
| 'mojo_js_unittests',
|
| @@ -56,8 +57,6 @@
|
| 'mojo_surfaces_app',
|
| 'mojo_surfaces_child_app',
|
| 'mojo_surfaces_child_gl_app',
|
| - 'mojo_surfaces_lib',
|
| - 'mojo_surfaces_lib_unittests',
|
| 'mojo_surfaces_service',
|
| 'mojo_test_app',
|
| 'mojo_test_request_tracker_app',
|
| @@ -360,8 +359,7 @@
|
| '../cc/cc.gyp:cc_surfaces',
|
| '../skia/skia.gyp:skia',
|
| '../gpu/gpu.gyp:gles2_implementation',
|
| - 'mojo_geometry_lib',
|
| - 'mojo_surfaces_lib',
|
| + 'mojo_converters',
|
| 'services/public/mojo_services_public.gyp:mojo_surfaces_bindings',
|
| ],
|
| 'includes': [
|
| @@ -532,8 +530,7 @@
|
| '../ui/events/events.gyp:events',
|
| '../ui/events/events.gyp:events_base',
|
| 'mojo_cc_support',
|
| - 'mojo_geometry_lib',
|
| - 'mojo_surfaces_lib',
|
| + 'mojo_converters',
|
| 'mojo_view_manager_lib',
|
| 'public/mojo_public.gyp:mojo_application_base',
|
| 'public/mojo_public.gyp:mojo_application_bindings',
|
|
|