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

Unified Diff: webkit/appcache/webkit_appcache.gypi

Issue 9254040: remove build_webkit_exes_from_webkit_gyp flag (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: put back blob's dependency on webkit, fix indentation Created 8 years, 11 months 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/content.gyp ('k') | webkit/blob/webkit_blob.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/appcache/webkit_appcache.gypi
diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi
index 8f82e59e20a49be9c5ea2788c5298419acd3cc57..b4c63b5cdf257c1a2c0491de0b8daecf0e9c213a 100644
--- a/webkit/appcache/webkit_appcache.gypi
+++ b/webkit/appcache/webkit_appcache.gypi
@@ -16,6 +16,7 @@
{
'target_name': 'appcache',
'variables': { 'enable_wexit_time_destructors': 1, },
+ 'type': '<(component)',
'defines': [
'APPCACHE_IMPLEMENTATION',
],
@@ -26,6 +27,7 @@
'<(DEPTH)/net/net.gyp:net',
'<(DEPTH)/sql/sql.gyp:sql',
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+ '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
],
'sources': [
# This list contains all .h and .cc in appcache except for test code.
@@ -79,27 +81,11 @@
'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)',
- }],
['inside_chromium_build==0', {
'dependencies': [
'<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
],
}],
- [# TODO(dpranke): Figure out why this doesn't work outside of
- # a webkit build - this seems to be a bug in the make gyp generator.
- # See http://code.google.com/p/chromium/issues/detail?id=105299 .
- 'OS!="mac" and inside_chromium_build==1', {
- 'dependencies': [
- '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
- ],
- }],
],
},
],
« no previous file with comments | « content/content.gyp ('k') | webkit/blob/webkit_blob.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698