diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 23:24:31 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 23:24:31 +0000 |
| commit | 4f511e4dcb88be361b2299af791628d18ff3eb4e (patch) | |
| tree | dedfcf0a8cc237afbdda953bface7b8425e68568 /content/content.gyp | |
| parent | cc4ecdf5001345d375e34f7430bbca42988d057f (diff) | |
| download | chromium_src-4f511e4dcb88be361b2299af791628d18ff3eb4e.zip chromium_src-4f511e4dcb88be361b2299af791628d18ff3eb4e.tar.gz chromium_src-4f511e4dcb88be361b2299af791628d18ff3eb4e.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109534 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 311c714..a08d7d8 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', |