diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 18:24:56 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 18:24:56 +0000 |
| commit | c014a08e687ea5549653ee50ac2ca67023c15ab2 (patch) | |
| tree | 576d6aa8c7ccca4ccca3ce35b06868f5495f2fe3 /content/content.gyp | |
| parent | 0711b5d9593e46b3ef0b8d0706418cb74f41e1f3 (diff) | |
| download | chromium_src-c014a08e687ea5549653ee50ac2ca67023c15ab2.zip chromium_src-c014a08e687ea5549653ee50ac2ca67023c15ab2.tar.gz chromium_src-c014a08e687ea5549653ee50ac2ca67023c15ab2.tar.bz2 | |
Revert 109534 since this change broke clobbered component build.
Original CL:
reenable component build w/ fix to test_support_content
TBR=jam@chromium.org
BUG=90442
TEST=the win shared debug builder compiles
Review URL: http://codereview.chromium.org/8501025
TBR=dpranke@chromium.org
Review URL: http://codereview.chromium.org/8538016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109654 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 a08d7d8..311c714 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', |