From 197eeace847bb687765593d6b2d33705e1144672 Mon Sep 17 00:00:00 2001 From: "dpranke@chromium.org" Date: Tue, 8 Nov 2011 03:52:32 +0000 Subject: enable component build for content R=jam@chromium.org BUG=90442 TEST= Review URL: http://codereview.chromium.org/8343068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@108976 0039d316-1c4b-4281-b951-d872f2087c98 --- content/content.gyp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'content/content.gyp') diff --git a/content/content.gyp b/content/content.gyp index be3f85c..0e8fa51 100644 --- a/content/content.gyp +++ b/content/content.gyp @@ -22,8 +22,11 @@ # 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): Uncomment: ['component == "static_library"', { - ['1 == 1', { + # + # 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"', { 'targets': [ {'target_name': 'content', 'type': 'none', -- cgit v1.1