Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(613)

Unified Diff: mojo/mojo_services.gypi

Issue 346613004: Use loadable module instead of shared library. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Small nits Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: mojo/mojo_services.gypi
diff --git a/mojo/mojo_services.gypi b/mojo/mojo_services.gypi
index 6386855b1dcc728e2ea7070b4252b6d0e79db0f3..2e0e2e26f820a10575689473ee41243811464eeb 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -16,24 +16,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',
],
},
{
@@ -67,15 +61,10 @@
},
{
'target_name': 'mojo_geometry_lib',
- 'type': '<(component)',
- 'defines': [
- 'MOJO_GEOMETRY_IMPLEMENTATION',
- ],
+ 'type': 'static_library',
'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',
@@ -216,17 +205,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',
@@ -265,16 +254,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': [

Powered by Google App Engine
This is Rietveld 408576698