Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content.gyp

Issue 8501025: reenable component build w/ fix to test_support_content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/common/content_export.h ('k') | webkit/appcache/appcache_export.h » ('j') | webkit/appcache/webkit_appcache.gypi » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index be3f85c6732549852aff9865435fbe45d12feb6e..0e8fa51792f9efdcdbcc4c9899d8888ea5e83d28 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',
« no previous file with comments | « content/common/content_export.h ('k') | webkit/appcache/appcache_export.h » ('j') | webkit/appcache/webkit_appcache.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698