reenable component build w/ fix to test_support_content

webkit/appcache/webkit_appcache.gypi

Index: webkit/appcache/webkit_appcache.gypi
diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi
index 1c7c13b4ea6dfab178eb08879fffeaa46378d35c..724b0a0b90c01371f5638b49f8dc45a452d30f7a 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',

[tony, 2011/11/11 21:31:42]

This breaks the webkit compile since the path to WebKit.gyp is different when
we're compiling upstream.  See webkit/glue/webkit_glue.gypi for an example of
how to use a variable to get the right path based on inside_chromium_build.

+          ],
+         }],
         ['inside_chromium_build==0', {
           'dependencies': [
             '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',