chrome/chrome_common.gypi - Issue 7748042: Merge trunk r97497 and its many dependents to the 14.0.835 branch.

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: chrome/chrome_common.gypi

Issue 7748042: Merge trunk r97497 and its many dependents to the 14.0.835 branch. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/835/src/

Patch Set: Created 9 years, 4 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

Index: chrome/chrome_common.gypi

===================================================================

--- chrome/chrome_common.gypi (revision 98423)

+++ chrome/chrome_common.gypi (working copy)

@@ -209,6 +209,8 @@

'common/jstemplate_builder.h',

'common/launchd_mac.h',

'common/launchd_mac.mm',

+ 'common/mac/cfbundle_blocker.h',

+ 'common/mac/cfbundle_blocker.mm',

'common/libxml_utils.cc',

'common/libxml_utils.h',

'common/native_window_notification_source.h',

@@ -332,6 +334,9 @@

}],

['OS=="mac"', {

+ 'dependencies': [

+ '../third_party/mach_override/mach_override.gyp:mach_override',

+ ],

'include_dirs': [

'../third_party/GTM',

« no previous file with comments | « chrome/browser/chrome_browser_application_mac.mm ('k') | chrome/common/mac/DEPS » ('j') | no next file with comments »