content/content_common.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_common.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_common.gypi

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

index 8e46bb5b3c4be2c59489cf8bb1f8fe723eb2c2df..9e0a8d61093ecc71498caf93f5aeaa03bd0183dd 100644

--- a/content/content_common.gypi

+++ b/content/content_common.gypi

@@ -8,6 +8,7 @@

'../components/tracing.gyp:tracing',

'../net/net.gyp:net',

'../skia/skia.gyp:skia',

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

'../third_party/icu/icu.gyp:icuuc',

'../third_party/libjingle/libjingle.gyp:libjingle',

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

@@ -22,6 +23,10 @@

'export_dependent_settings': [

'../base/base.gyp:base',

+ # 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',

'sources': [

'public/common/assert_matching_enums.cc',