diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 21:55:18 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-16 21:55:18 +0000 |
| commit | 5cba9ff723227ca847c8cb4186be45ea903f9794 (patch) | |
| tree | 3eb4776e934e7a7fb3a007a80bb08f549b0368d6 /content/content.gyp | |
| parent | 1562042283de1138d4386d1fea05d9028fbc8b0c (diff) | |
| download | chromium_src-5cba9ff723227ca847c8cb4186be45ea903f9794.zip chromium_src-5cba9ff723227ca847c8cb4186be45ea903f9794.tar.gz chromium_src-5cba9ff723227ca847c8cb4186be45ea903f9794.tar.bz2 | |
Enable content component (again!).
This version fixes a problem with the windows incremental linking build. We can't incrementally link chrome when content is being built as a DLL because chrome links in webkit_glue and webkit_glue depends on symbols defined in content. We can remove this when we fix glue.
R=jam@chromium.org
BUG=90442, 98755.
Review URL: http://codereview.chromium.org/8570024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110360 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/content/content.gyp b/content/content.gyp index 51ff0f1..a4fc736 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -22,8 +22,14 @@ # 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): Uncomment: ['component == "static_library"', { - ['1 == 1', { + # + # 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', { + 'target_defines': [ + 'COMPILE_CONTENT_STATICALLY', + ], 'targets': [ {'target_name': 'content', 'type': 'none', @@ -192,8 +198,6 @@ ], }, { # component != static_library - 'target_defaults': { - }, 'targets': [ {'target_name': 'content', 'type': 'shared_library', |