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.
[email protected]
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
diff --git a/build/common.gypi b/build/common.gypi
index 21269b01..b9de7c5a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -960,6 +960,14 @@
['component=="shared_library"', {
'defines': ['COMPONENT_BUILD'],
}],
+ ['component=="shared_library" and incremental_chrome_dll==1', {
+ # TODO(dpranke): 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.
+ # See http://code.google.com/p/chromium/issues/detail?id=98755 .
+ 'defines': ['COMPILE_CONTENT_STATICALLY'],
+ }],
['toolkit_views==1', {
'defines': ['TOOLKIT_VIEWS=1'],
}],
