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

Unified Diff: mojo/mojo_services.gypi

Issue 231353002: Make mojo_system static and mojo_system_impl a component, never use both (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Get content builds to work Created 6 years, 8 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 f2106a7dd626b54a3427ba3acd3501593cb19940..12489107566bae6ecad8ead65aae6a3db3555d83 100644
--- a/mojo/mojo_services.gypi
+++ b/mojo/mojo_services.gypi
@@ -16,12 +16,10 @@
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
'mojo_bindings',
- 'mojo_system',
],
'dependencies': [
'../gpu/gpu.gyp:command_buffer_common',
'mojo_bindings',
- 'mojo_system',
],
},
{
@@ -55,16 +53,14 @@
'includes': [ 'public/tools/bindings/mojom_bindings_generator.gypi' ],
'export_dependent_settings': [
'mojo_bindings',
- 'mojo_system',
],
'dependencies': [
'mojo_bindings',
- 'mojo_system',
],
},
{
'target_name': 'mojo_native_viewport_service',
- 'type': '<(component)',
+ 'type': 'shared_library',
'dependencies': [
'../base/base.gyp:base',
'../ui/events/events.gyp:events',
@@ -75,6 +71,7 @@
'mojo_gles2_service',
'mojo_native_viewport_bindings',
'mojo_shell_client',
+ 'mojo_system',
],
'defines': [
'MOJO_NATIVE_VIEWPORT_IMPLEMENTATION',

Powered by Google App Engine
This is Rietveld 408576698