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

Unified Diff: mojo/mojo_public.gypi

Issue 208223006: Revert of Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/mojo_services.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mojo/mojo_public.gypi
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 78ffb5165300e5b170a4433566c5f562effbd1a3..a17d3d4c6f66db74551b57d971d4d51ff26489c6 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -349,31 +349,20 @@
'target_name': 'mojo_shell_bindings',
'type': 'static_library',
'sources': [
- 'public/shell/shell.mojom',
- ],
- 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
- 'dependencies': [
- 'mojo_bindings',
- 'mojo_system',
- ],
- 'export_dependent_settings': [
- 'mojo_bindings',
- ],
- },
- {
- 'target_name': 'mojo_shell_client',
- 'type': 'static_library',
- 'sources': [
'public/shell/lib/application.cc',
'public/shell/lib/service.cc',
'public/shell/application.h',
'public/shell/service.h',
- ],
- 'dependencies': [
- 'mojo_shell_bindings',
+ 'public/shell/shell.mojom',
+ ],
+ 'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],
+ 'dependencies': [
+ 'mojo_bindings',
+ 'mojo_system',
],
'export_dependent_settings': [
- 'mojo_shell_bindings',
+ 'mojo_bindings',
+ 'mojo_system',
],
},
],
« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/mojo_services.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698