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

Unified Diff: webkit/appcache/webkit_appcache.gypi

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 | « webkit/appcache/appcache_export.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/appcache/webkit_appcache.gypi
===================================================================
--- webkit/appcache/webkit_appcache.gypi (revision 109652)
+++ webkit/appcache/webkit_appcache.gypi (working copy)
@@ -6,6 +6,9 @@
'targets': [
{
'target_name': 'appcache',
+ # TODO(dpranke): Uncomment '<(component)',
+ # 'type': '<(component)',
+ 'type': 'static_library',
'defines': [
'APPCACHE_IMPLEMENTATION',
],
@@ -16,6 +19,7 @@
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/sql/sql.gyp:sql',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ # TODO(dpranke): Uncomment '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
],
'sources': [
# This list contains all .h and .cc in appcache except for test code.
@@ -69,17 +73,6 @@
'webkit_appcache.gypi',
],
'conditions': [
- [# TODO(dpranke): Remove once the circular dependencies in
- # WebKit.gyp are fixed on the mac.
- # See https://bugs.webkit.org/show_bug.cgi?id=68463
- 'OS=="mac"', {
- 'type': 'static_library',
- }, {
- 'type': '<(component)',
- 'dependencies': [
- '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
- ],
- }],
['inside_chromium_build==0', {
'dependencies': [
'<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
« no previous file with comments | « webkit/appcache/appcache_export.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698