chrome/chrome.gyp - Issue 19795004: Merge 212415 "reland of http://crrev.com/212230 Create top-level..."

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

Issue 19795004: Merge 212415 "reland of http://crrev.com/212230 Create top-level..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1569/src/

Patch Set: Created 7 years, 5 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.gyp

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

--- chrome/chrome.gyp (revision 212608)

+++ chrome/chrome.gyp (working copy)

@@ -18,7 +18,6 @@

'chromium_child_dependencies': [

'common',

- '../content/content.gyp:content_app',

'../sync/sync.gyp:sync',

'allocator_target': '../base/allocator/allocator.gyp:allocator',

@@ -30,9 +29,8 @@

'conditions': [

['OS!="ios"', {

'chromium_browser_dependencies': [

- 'debugger',

- '../content/content.gyp:content_ppapi_plugin',

'../printing/printing.gyp:printing',

+ '../ppapi/ppapi_internal.gyp:ppapi_host',

'chromium_child_dependencies': [

'debugger',

@@ -42,7 +40,6 @@

'../content/content.gyp:content_gpu',

'../content/content.gyp:content_ppapi_plugin',

'../content/content.gyp:content_worker',

- '../printing/printing.gyp:printing',

'../third_party/WebKit/Source/devtools/devtools.gyp:devtools_frontend_resources',

}],

« no previous file with comments | « chrome/app/client_util.cc ('k') | chrome/chrome_common.gypi » ('j') | no next file with comments »