mojo/mojo_public.gypi - Issue 187183002: Add creation of ServiceManager to Content

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mojo/mojo_public.gypi

Issue 187183002: Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge problem 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:

Index: mojo/mojo_public.gypi

diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi

index a17d3d4c6f66db74551b57d971d4d51ff26489c6..78ffb5165300e5b170a4433566c5f562effbd1a3 100644

--- a/mojo/mojo_public.gypi

+++ b/mojo/mojo_public.gypi

@@ -349,10 +349,6 @@

'target_name': 'mojo_shell_bindings',

'type': 'static_library',

'sources': [

- 'public/shell/lib/application.cc',

- 'public/shell/lib/service.cc',

- 'public/shell/application.h',

- 'public/shell/service.h',

'public/shell/shell.mojom',

'includes': [ 'public/bindings/mojom_bindings_generator.gypi' ],

@@ -362,7 +358,22 @@

'export_dependent_settings': [

'mojo_bindings',

- 'mojo_system',

+ ],

+ },

+ {

+ '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',

+ ],

+ 'export_dependent_settings': [

+ 'mojo_shell_bindings',

« no previous file with comments | « mojo/mojo_examples.gypi ('k') | mojo/mojo_services.gypi » ('j') | no next file with comments »