diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 03:52:32 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-08 03:52:32 +0000 |
| commit | 197eeace847bb687765593d6b2d33705e1144672 (patch) | |
| tree | 489222a26f51a98a81e55c29ab758cd4af083541 /content/content.gyp | |
| parent | b525f1df99edd9a62b2e828c8e5d57f996f85792 (diff) | |
| download | chromium_src-197eeace847bb687765593d6b2d33705e1144672.zip chromium_src-197eeace847bb687765593d6b2d33705e1144672.tar.gz chromium_src-197eeace847bb687765593d6b2d33705e1144672.tar.bz2 | |
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
Diffstat (limited to 'content/content.gyp')
| -rw-r--r-- | content/content.gyp | 7 |
1 files changed, 5 insertions, 2 deletions
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', |