content/content.gyp - Issue 9254040: remove build_webkit_exes_from_webkit_gyp flag

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 9254040: remove build_webkit_exes_from_webkit_gyp flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: put back blob's dependency on webkit, fix indentation Created 8 years, 11 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 a4fc7368dba3c8ab42086aa2b52fb358549dc3df..1973d1f6cdf8b7ef1b6ddbd400c62d36d71ecb8b 100644

--- a/content/content.gyp

+++ b/content/content.gyp

@@ -22,11 +22,7 @@

# upstream unnecessarily (e.g., content_renderer depends on allocator

# and chrome_exe depends on content_common but we don't want

# chrome_exe to have to depend on allocator).

- #

- # TODO(dpranke): Remove the mac conditional once the circular

- # dependencies in WebKit.gyp are fixed.

- # See https://bugs.webkit.org/show_bug.cgi?id=68463

- ['OS=="mac" or component=="static_library" or incremental_chrome_dll==1', {

+ ['component=="static_library" or incremental_chrome_dll==1', {

'target_defines': [

'COMPILE_CONTENT_STATICALLY',

« no previous file with comments | « build/common.gypi ('k') | webkit/appcache/webkit_appcache.gypi » ('j') | no next file with comments »