content/content.gyp - Issue 9690001: mac: Make content depend on mach_override in shared builds

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.gyp

Issue 9690001: mac: Make content depend on mach_override in shared builds (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 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.gyp

diff --git a/content/content.gyp b/content/content.gyp

index fbcd997a679f26079588c4d71501d28f26f995d9..ad8091c79dc61acb745118c4baaddb63a5e3fb3e 100644

--- a/content/content.gyp

+++ b/content/content.gyp

@@ -136,9 +136,16 @@

{'target_name': 'content',

'type': 'shared_library',

'variables': { 'enable_wexit_time_destructors': 1, },

- 'dependencies': [

- 'content_resources.gyp:content_resources',

- ],

+ 'dependencies': [

+ 'content_resources.gyp:content_resources',

+ ],

+ 'conditions': [

+ ['OS=="mac"', {

+ 'dependencies': [

+ '<(DEPTH)/third_party/mach_override/mach_override.gyp:mach_override',

+ ],

+ }],

+ ],

'includes': [

'content_app.gypi',

'content_browser.gypi',

« no previous file with comments | « no previous file | no next file » | no next file with comments »