diff options
| author | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 05:55:58 +0000 |
|---|---|---|
| committer | thakis@chromium.org <thakis@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 05:55:58 +0000 |
| commit | 0c32bac85f886491e61c3d7f031fa78a50e03729 (patch) | |
| tree | c06f5c7172a98929092c9564b616e39b1410441f /content/content.gyp | |
| parent | 8a810d9876bff1cee4f67b48efb406a8fafdd21a (diff) | |
| download | chromium_src-0c32bac85f886491e61c3d7f031fa78a50e03729.zip chromium_src-0c32bac85f886491e61c3d7f031fa78a50e03729.tar.gz chromium_src-0c32bac85f886491e61c3d7f031fa78a50e03729.tar.bz2 | |
Revert 108976 (broke win shared) - enable component build for content
R=jam@chromium.org
BUG=90442
TEST=
Review URL: http://codereview.chromium.org/8343068
TBR=dpranke@chromium.org
Review URL: http://codereview.chromium.org/8496006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108979 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/content/content.gyp b/content/content.gyp index 0e8fa51..be3f85c 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -22,11 +22,8 @@ # 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"', { + # TODO(dpranke): Uncomment: ['component == "static_library"', { + ['1 == 1', { 'targets': [ {'target_name': 'content', 'type': 'none', |