diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 01:34:35 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 01:34:35 +0000 |
| commit | 47f16765d51098c1562d7ad304f8554c66f603ed (patch) | |
| tree | 1ebd6e60746d455f50ddecab787efc5475293ad5 /content/content.gyp | |
| parent | 4bf2e4003851f94c36f4540231572539f10f3596 (diff) | |
| download | chromium_src-47f16765d51098c1562d7ad304f8554c66f603ed.zip chromium_src-47f16765d51098c1562d7ad304f8554c66f603ed.tar.gz chromium_src-47f16765d51098c1562d7ad304f8554c66f603ed.tar.bz2 | |
remove build_webkit_exes_from_webkit_gyp flag
R=tony@chromium.org
BUG=105823
TEST=everything stays green
Review URL: https://chromiumcodereview.appspot.com/9254040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/content/content.gyp b/content/content.gyp index a4fc736..1973d1f 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', ], |