Index: mojo/mojo_services.gypi |
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi |
index 2fd4583d44089f6eec509f07dbeb0bb60f03b8af..2bbbcfd9c6ecf07e49051ce0d481dfa9da394f98 100644 |
--- a/mojo/mojo_services.gypi |
+++ b/mojo/mojo_services.gypi |
@@ -20,24 +20,18 @@ |
}, |
{ |
'target_name': 'mojo_input_events_lib', |
- 'type': '<(component)', |
- 'defines': [ |
- 'MOJO_INPUT_EVENTS_IMPLEMENTATION', |
- ], |
+ 'type': 'static_library', |
'dependencies': [ |
'../base/base.gyp:base', |
'../ui/events/events.gyp:events', |
'../ui/gfx/gfx.gyp:gfx_geometry', |
- 'mojo_environment_chromium', |
'mojo_input_events_bindings', |
'mojo_geometry_bindings', |
'mojo_geometry_lib', |
- 'mojo_system_impl', |
], |
'sources': [ |
'services/public/cpp/input_events/lib/input_events_type_converters.cc', |
'services/public/cpp/input_events/input_events_type_converters.h', |
- 'services/public/cpp/input_events/mojo_input_events_export.h', |
], |
}, |
{ |
@@ -71,17 +65,12 @@ |
}, |
{ |
'target_name': 'mojo_geometry_lib', |
- 'type': '<(component)', |
- 'defines': [ |
- 'MOJO_GEOMETRY_IMPLEMENTATION', |
- ], |
+ 'type': 'static_library', |
'dependencies': [ |
'../skia/skia.gyp:skia', |
'../ui/gfx/gfx.gyp:gfx', |
'../ui/gfx/gfx.gyp:gfx_geometry', |
- 'mojo_environment_chromium', |
'mojo_geometry_bindings', |
- 'mojo_system_impl', |
], |
'export_dependent_settings': [ |
'../ui/gfx/gfx.gyp:gfx', |
@@ -275,17 +264,17 @@ |
}, |
{ |
'target_name': 'mojo_network_service', |
- 'type': 'shared_library', |
+ 'type': 'loadable_module', |
'dependencies': [ |
'../base/base.gyp:base', |
'../net/net.gyp:net', |
'../url/url.gyp:url_lib', |
'mojo_application', |
- 'mojo_common_lib', |
- 'mojo_environment_chromium', |
+ 'mojo_common_embedded_lib', |
+ 'mojo_environment_chromium_embedded', |
'mojo_network_bindings', |
'mojo_profile_service_bindings', |
- 'mojo_system_impl', |
+ 'mojo_system', |
], |
'export_dependent_settings': [ |
'mojo_network_bindings', |
@@ -324,16 +313,17 @@ |
}, |
{ |
'target_name': 'mojo_launcher', |
- 'type': 'shared_library', |
+ 'type': 'loadable_module', |
'dependencies': [ |
'../base/base.gyp:base', |
'../url/url.gyp:url_lib', |
'mojo_application', |
+ 'mojo_common_embedded_lib', |
'mojo_cpp_bindings', |
- 'mojo_environment_chromium', |
+ 'mojo_environment_chromium_embedded', |
'mojo_launcher_bindings', |
'mojo_network_bindings', |
- 'mojo_system_impl', |
+ 'mojo_system', |
'mojo_utility', |
], |
'sources': [ |