diff options
| author | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 01:34:35 +0000 |
|---|---|---|
| committer | dpranke@chromium.org <dpranke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-24 01:34:35 +0000 |
| commit | 47f16765d51098c1562d7ad304f8554c66f603ed (patch) | |
| tree | 1ebd6e60746d455f50ddecab787efc5475293ad5 /webkit/appcache | |
| parent | 4bf2e4003851f94c36f4540231572539f10f3596 (diff) | |
| download | chromium_src-47f16765d51098c1562d7ad304f8554c66f603ed.zip chromium_src-47f16765d51098c1562d7ad304f8554c66f603ed.tar.gz chromium_src-47f16765d51098c1562d7ad304f8554c66f603ed.tar.bz2 | |
remove build_webkit_exes_from_webkit_gyp flag
R=tony@chromium.org
BUG=105823
TEST=everything stays green
Review URL: https://chromiumcodereview.appspot.com/9254040
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118774 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/appcache')
| -rw-r--r-- | webkit/appcache/webkit_appcache.gypi | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi index 8f82e59..b4c63b5 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', - ], - }], ], }, ], |