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

Unified Diff: content/content.gyp

Issue 8538016: Revert 109534 since this change broke clobbered component build. (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') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
===================================================================
--- content/content.gyp (revision 109652)
+++ content/content.gyp (working copy)
@@ -22,11 +22,8 @@
# 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): 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"', {
+ # TODO(dpranke): Uncomment: ['component == "static_library"', {
+ ['1 == 1', {
'targets': [
{'target_name': 'content',
'type': 'none',
« no previous file with comments | « content/common/content_export.h ('k') | webkit/appcache/appcache_export.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698