diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 23:24:31 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-10 23:24:31 +0000 |
| commit | 4f511e4dcb88be361b2299af791628d18ff3eb4e (patch) | |
| tree | dedfcf0a8cc237afbdda953bface7b8425e68568 /webkit/appcache | |
| parent | cc4ecdf5001345d375e34f7430bbca42988d057f (diff) | |
| download | chromium_src-4f511e4dcb88be361b2299af791628d18ff3eb4e.zip chromium_src-4f511e4dcb88be361b2299af791628d18ff3eb4e.tar.gz chromium_src-4f511e4dcb88be361b2299af791628d18ff3eb4e.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@109534 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, 12 insertions, 6 deletions
diff --git a/webkit/appcache/appcache_export.h b/webkit/appcache/appcache_export.h index 130816a..ece56ee 100644 --- a/webkit/appcache/appcache_export.h +++ b/webkit/appcache/appcache_export.h @@ -6,8 +6,7 @@ #define WEBKIT_APPCACHE_APPCACHE_EXPORT_H_ #pragma once -// TODO(dpranke): Uncomment to enable appcache component build. -#if 0 // defined(COMPONENT_BUILD) +#if 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 1c7c13b..724b0a0 100644 --- a/webkit/appcache/webkit_appcache.gypi +++ b/webkit/appcache/webkit_appcache.gypi @@ -6,9 +6,6 @@ 'targets': [ { 'target_name': 'appcache', - # TODO(dpranke): Uncomment '<(component)', - # 'type': '<(component)', - 'type': 'static_library', 'defines': [ 'APPCACHE_IMPLEMENTATION', ], @@ -19,7 +16,6 @@ '<(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. @@ -73,6 +69,17 @@ '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', |