content/content_browser.gypi - Issue 189713002: Declare dependency on blink_headers in targets that use blink headers

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

Issue 189713002: Declare dependency on blink_headers in targets that use blink headers (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge of export_dependent_settings block in content_browser.gypi 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_browser.gypi

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

index 4e943fcde90a9a659117d39035338492794e11ef..74f931b6d86c2d42aeef4361d4ee7e2e7ad5d81c 100644

--- a/content/content_browser.gypi

+++ b/content/content_browser.gypi

@@ -13,6 +13,7 @@

'../third_party/re2/re2.gyp:re2',

'../third_party/zlib/google/zip.gyp:zip',

'../third_party/zlib/zlib.gyp:zlib',

+ '../third_party/WebKit/public/blink_headers.gyp:blink_headers',

'../ui/accessibility/accessibility.gyp:accessibility',

'../ui/accessibility/accessibility.gyp:ax_gen',

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

@@ -26,6 +27,10 @@

'export_dependent_settings': [

'../ui/accessibility/accessibility.gyp:ax_gen',

+ # The public content API headers directly include Blink API headers, so we

+ # have to export the blink header settings so that relative paths in these

+ # headers resolve correctly.

+ '../third_party/WebKit/public/blink_headers.gyp:blink_headers',

'include_dirs': [

'..',