summaryrefslogtreecommitdiffstats
path: root/chrome/nacl.gypi
diff options
context:
space:
mode:
authordpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-16 21:55:18 +0000
committerdpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-16 21:55:18 +0000
commit5cba9ff723227ca847c8cb4186be45ea903f9794 (patch)
tree3eb4776e934e7a7fb3a007a80bb08f549b0368d6 /chrome/nacl.gypi
parent1562042283de1138d4386d1fea05d9028fbc8b0c (diff)
downloadchromium_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 'chrome/nacl.gypi')
-rw-r--r--chrome/nacl.gypi1
1 files changed, 1 insertions, 0 deletions
diff --git a/chrome/nacl.gypi b/chrome/nacl.gypi
index 432710d..986abdc 100644
--- a/chrome/nacl.gypi
+++ b/chrome/nacl.gypi
@@ -109,6 +109,7 @@
],
'defines': [
'<@(nacl_win64_defines)',
+ 'COMPILE_CONTENT_STATICALLY',
],
'configurations': {
'Common_Base': {