| 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',
|
| - ],
|
| - }],
|
| ],
|
| },
|
| ],
|
|
|