summaryrefslogtreecommitdiffstats
path: root/content/content.gyp
diff options
context:
space:
mode:
authorrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-08 03:30:16 +0000
committerrsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-08 03:30:16 +0000
commit9f9123b61803ca5974ca17df32f9b5660a61bf1c (patch)
tree2f44febfe0793df83ae20d16ce0f335f009545d0 /content/content.gyp
parentb6994152db76d90ec6ecca19a71532acbf39bb96 (diff)
downloadchromium_src-9f9123b61803ca5974ca17df32f9b5660a61bf1c.zip
chromium_src-9f9123b61803ca5974ca17df32f9b5660a61bf1c.tar.gz
chromium_src-9f9123b61803ca5974ca17df32f9b5660a61bf1c.tar.bz2
Revert 104632 - enable component build for content and appcache.
R=jam@chromium.org BUG=90442 TEST= Review URL: http://codereview.chromium.org/7888053 TBR=dpranke@chromium.org Review URL: http://codereview.chromium.org/8200023 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104645 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content.gyp')
-rw-r--r--content/content.gyp7
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',