content/content_app.gypi - Issue 360563004: Enable Mojo on iOS

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: content/content_app.gypi

Issue 360563004: Enable Mojo on iOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Reduce diff in mojo_public.gypi 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:

Index: content/content_app.gypi

diff --git a/content/content_app.gypi b/content/content_app.gypi

index d285cc78656bf1ae29eae4cb86a9ef626a667c07..cad3ff6869961fc4f944cdcd792d51884c89c76e 100644

--- a/content/content_app.gypi

+++ b/content/content_app.gypi

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

'../base/base.gyp:base',

'../base/base.gyp:base_i18n',

'../crypto/crypto.gyp:crypto',

+ '../mojo/mojo.gyp:mojo_environment_chromium',

+ '../mojo/mojo.gyp:mojo_interface_provider_bindings',

+ '../mojo/mojo.gyp:mojo_service_manager',

+ '../mojo/mojo.gyp:mojo_system_impl',

'../ui/base/ui_base.gyp:ui_base',

'../ui/gfx/gfx.gyp:gfx',

'../ui/gfx/gfx.gyp:gfx_geometry',

@@ -61,16 +65,7 @@

['OS=="ios"', {

'sources!': [

'app/content_main.cc',

- 'app/mojo/mojo_init.cc',

- 'app/mojo/mojo_init.h',

- }, { # OS!="ios"

- 'dependencies': [

- '../mojo/mojo.gyp:mojo_environment_chromium',

- '../mojo/mojo.gyp:mojo_interface_provider_bindings',

- '../mojo/mojo.gyp:mojo_service_manager',

- '../mojo/mojo.gyp:mojo_system_impl',

- ],

}],

}

« no previous file with comments | « content/app/content_main_runner.cc ('k') | mojo/mojo.gyp » ('j') | no next file with comments »