content/content_common.gypi - Issue 226213002: Removes use_mojo

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_common.gypi

Issue 226213002: Removes use_mojo (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: merge 2 trunk 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: content/content_common.gypi

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

index 5f51794e7754801295cdc3bf08c2f067fc24f842..01b5f42ec555cbee429a7804f1b071c663e19dab 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -500,6 +500,9 @@

'../ipc/ipc.gyp:ipc',

'../media/media.gyp:media',

'../media/media.gyp:shared_memory_support',

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

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

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

'../third_party/WebKit/public/blink.gyp:blink',

'../ui/gl/gl.gyp:gl',

'../webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',

@@ -509,18 +512,6 @@

'content.gyp:webkit_version',

}],

- ['use_mojo==0', {

- 'sources!': [

- 'common/mojo/mojo_channel_init.cc',

- 'common/mojo/mojo_channel_init.h',

- ],

- }, {

- 'dependencies': [

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

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

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

- ],

- }],

['OS=="mac"', {

'dependencies': [

'../webkit/webkit_resources.gyp:webkit_resources',

« no previous file with comments | « content/content_browser.gypi ('k') | content/content_renderer.gypi » ('j') | no next file with comments »