diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 18:24:56 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-11 18:24:56 +0000 |
| commit | c014a08e687ea5549653ee50ac2ca67023c15ab2 (patch) | |
| tree | 576d6aa8c7ccca4ccca3ce35b06868f5495f2fe3 /webkit/appcache | |
| parent | 0711b5d9593e46b3ef0b8d0706418cb74f41e1f3 (diff) | |
| download | chromium_src-c014a08e687ea5549653ee50ac2ca67023c15ab2.zip chromium_src-c014a08e687ea5549653ee50ac2ca67023c15ab2.tar.gz chromium_src-c014a08e687ea5549653ee50ac2ca67023c15ab2.tar.bz2 | |
Revert 109534 since this change broke clobbered component build.
Original CL:
reenable component build w/ fix to test_support_content
TBR=jam@chromium.org
BUG=90442
TEST=the win shared debug builder compiles
Review URL: http://codereview.chromium.org/8501025
TBR=dpranke@chromium.org
Review URL: http://codereview.chromium.org/8538016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache')
| -rw-r--r-- | webkit/appcache/appcache_export.h | 3 | ||||
| -rw-r--r-- | webkit/appcache/webkit_appcache.gypi | 15 |
2 files changed, 6 insertions, 12 deletions
diff --git a/webkit/appcache/appcache_export.h b/webkit/appcache/appcache_export.h index ece56ee..130816a 100644 --- a/webkit/appcache/appcache_export.h +++ b/webkit/appcache/appcache_export.h @@ -6,7 +6,8 @@ #define WEBKIT_APPCACHE_APPCACHE_EXPORT_H_ #pragma once -#if defined(COMPONENT_BUILD) +// TODO(dpranke): Uncomment to enable appcache component build. +#if 0 // defined(COMPONENT_BUILD) #if defined(WIN32) #if defined(APPCACHE_IMPLEMENTATION) diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi index 724b0a0..1c7c13b 100644 --- a/webkit/appcache/webkit_appcache.gypi +++ b/webkit/appcache/webkit_appcache.gypi @@ -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', |