diff options
Diffstat (limited to 'content')
| -rw-r--r-- | content/common/content_export.h | 2 | ||||
| -rw-r--r-- | content/content.gyp | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/content/common/content_export.h b/content/common/content_export.h index fc91b72c..b39cdd5 100644 --- a/content/common/content_export.h +++ b/content/common/content_export.h @@ -6,7 +6,7 @@ #define CONTENT_COMMON_CONTENT_EXPORT_H_ #pragma once -#if 0 // TODO(dpranke): Uncomment: defined(COMPONENT_BUILD). +#if defined(COMPONENT_BUILD) && !defined(COMPILE_CONTENT_STATICALLY) #if defined(WIN32) #if defined(CONTENT_IMPLEMENTATION) 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', |