Move glue, appcache, and database targets out of webkit into gypi files.

We include these new gypi files from webkit.gyp (used when building
within a chromium checkout) and from webkit_support.gyp (used when
building from within a webkit checkout).

TEST=everything still compiles
Review URL: http://codereview.chromium.org/840003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41563 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 454 insertions, 415 deletions

diff --git a/webkit/appcache/webkit_appcache.gypi b/webkit/appcache/webkit_appcache.gypi
new file mode 100644
index 0000000..ebf8f65
--- /dev/null
+++ b/webkit/appcache/webkit_appcache.gypi
@@ -0,0 +1,62 @@
+# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'appcache',
+      'type': '<(library)',
+      'msvs_guid': '0B945915-31A7-4A07-A5B5-568D737A39B1',
+      'dependencies': [
+        '<(DEPTH)/app/app.gyp:app_base',
+        '<(DEPTH)/net/net.gyp:net',
+      ],
+      'sources': [
+        # This list contains all .h and .cc in appcache except for test code.
+        'appcache.cc',
+        'appcache.h',
+        'appcache_backend_impl.cc',
+        'appcache_backend_impl.h',
+        'appcache_database.cc',
+        'appcache_database.h',
+        'appcache_entry.h',
+        'appcache_frontend_impl.cc',
+        'appcache_frontend_impl.h',
+        'appcache_group.cc',
+        'appcache_group.h',
+        'appcache_host.cc',
+        'appcache_host.h',
+        'appcache_interceptor.cc',
+        'appcache_interceptor.h',
+        'appcache_interfaces.cc',
+        'appcache_interfaces.h',
+        'appcache_policy.h',
+        'appcache_request_handler.cc',
+        'appcache_request_handler.h',
+        'appcache_response.cc',
+        'appcache_response.h',
+        'appcache_service.cc',
+        'appcache_service.h',
+        'appcache_storage.cc',
+        'appcache_storage.h',
+        'appcache_storage_impl.cc',
+        'appcache_storage_impl.h',
+        'appcache_thread.cc',
+        'appcache_thread.h',
+        'appcache_working_set.cc',
+        'appcache_working_set.h',
+        'appcache_update_job.cc',
+        'appcache_update_job.h',
+        'appcache_url_request_job.cc',
+        'appcache_url_request_job.h',
+        'manifest_parser.cc',
+        'manifest_parser.h',
+        'mock_appcache_storage.cc',
+        'mock_appcache_storage.h',
+        'web_application_cache_host_impl.cc',
+        'web_application_cache_host_impl.h',
+      ],
+    },
+  ],
+}
diff --git a/webkit/database/webkit_database.gypi b/webkit/database/webkit_database.gypi
new file mode 100644
index 0000000..4936a14
--- /dev/null
+++ b/webkit/database/webkit_database.gypi
@@ -0,0 +1,32 @@
+# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'targets': [
+    {
+      'target_name': 'database',
+      'type': '<(library)',
+      'msvs_guid': '1DA00DDD-44E5-4C56-B2CC-414FB0164492',
+      'dependencies': [
+        '<(DEPTH)/app/app.gyp:app_base',
+        '<(DEPTH)/base/base.gyp:base',
+        '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
+      ],
+      'sources': [
+        'databases_table.cc',
+        'databases_table.h',
+        'database_connections.cc',
+        'database_connections.h',
+        'database_tracker.cc',
+        'database_tracker.h',
+        'database_util.cc',
+        'database_util.h',
+        'quota_table.cc',
+        'quota_table.h',
+        'vfs_backend.cc',
+        'vfs_backend.h',
+      ],
+    },
+  ],
+}
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
new file mode 100644
index 0000000..6d510b7
--- /dev/null
+++ b/webkit/glue/webkit_glue.gypi
@@ -0,0 +1,350 @@
+# Copyright (c) 2010 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+{
+  'variables': {
+    'conditions': [
+      ['inside_chromium_build==0', {
+        'webkit_src_dir': '../../../..',
+      },{
+        'webkit_src_dir': '../../third_party/WebKit',
+      }],
+    ],
+
+    'grit_info_cmd': ['python', '<(DEPTH)/tools/grit/grit_info.py'],
+    'grit_cmd': ['python', '<(DEPTH)/tools/grit/grit.py'],
+  },
+  'targets': [
+    {
+      'target_name': 'webkit_resources',
+      'type': 'none',
+      'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
+      },
+      'actions': [
+        {
+          'action_name': 'webkit_resources',
+          'variables': {
+            'input_path': 'webkit_resources.grd',
+          },
+          'inputs': [
+            '<!@(<(grit_info_cmd) --inputs <(input_path))',
+          ],
+          'outputs': [
+            '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
+          ],
+          'action': ['<@(grit_cmd)',
+                     '-i', '<(input_path)', 'build',
+                     '-o', '<(grit_out_dir)'],
+          'message': 'Generating resources from <(input_path)',
+        },
+        {
+          'action_name': 'webkit_chromium_resources',
+          'variables': {
+            'input_path': '<(webkit_src_dir)/WebKit/chromium/WebKit.grd',
+          },
+          'inputs': [
+            '<!@(<(grit_info_cmd) --inputs <(input_path))',
+          ],
+          'outputs': [
+            '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
+          ],
+          'action': ['<@(grit_cmd)',
+                     '-i', '<(input_path)', 'build',
+                     '-o', '<(grit_out_dir)'],
+          'message': 'Generating resources from <(input_path)',
+        },
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/webkit',
+        ],
+      },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['<(DEPTH)/build/win/system.gyp:cygwin'],
+        }],
+      ],
+    },
+    {
+      'target_name': 'webkit_strings',
+      'type': 'none',
+      'msvs_guid': '60B43839-95E6-4526-A661-209F16335E0E',
+      'variables': {
+        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
+      },
+      'actions': [
+        {
+          'action_name': 'webkit_strings',
+          'variables': {
+            'input_path': 'webkit_strings.grd',
+          },
+          'inputs': [
+            '<!@(<(grit_info_cmd) --inputs <(input_path))',
+          ],
+          'outputs': [
+            '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
+          ],
+          'action': ['<@(grit_cmd)',
+                     '-i', '<(input_path)', 'build',
+                     '-o', '<(grit_out_dir)'],
+          'message': 'Generating resources from <(input_path)',
+        },
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '<(SHARED_INTERMEDIATE_DIR)/webkit',
+        ],
+      },
+      'conditions': [
+        ['OS=="win"', {
+          'dependencies': ['<(DEPTH)/build/win/system.gyp:cygwin'],
+        }],
+      ],
+    },
+    {
+      'target_name': 'glue',
+      'type': '<(library)',
+      'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09',
+      'dependencies': [
+        '<(DEPTH)/app/app.gyp:app_base',
+        '<(DEPTH)/net/net.gyp:net',
+        '<(webkit_src_dir)/WebCore/WebCore.gyp/WebCore.gyp:webcore',
+        'webkit_resources',
+        'webkit_strings',
+      ],
+      'actions': [
+        {
+          'action_name': 'webkit_version',
+          'inputs': [
+            '../build/webkit_version.py',
+            '<(webkit_src_dir)/WebCore/Configurations/Version.xcconfig',
+          ],
+          'outputs': [
+            '<(INTERMEDIATE_DIR)/webkit_version.h',
+          ],
+          'action': ['python', '<@(_inputs)', '<(INTERMEDIATE_DIR)'],
+        },
+      ],
+      'include_dirs': [
+        '<(INTERMEDIATE_DIR)',
+        '<(SHARED_INTERMEDIATE_DIR)/webkit',
+      ],
+      'sources': [
+        # This list contains all .h, .cc, and .mm files in glue except for
+        # those in the test subdirectory and those with unittest in in their
+        # names.
+        'devtools_message_data.cc',
+        'devtools_message_data.h',
+        'media/buffered_data_source.cc',
+        'media/buffered_data_source.h',
+        'media/media_resource_loader_bridge_factory.cc',
+        'media/media_resource_loader_bridge_factory.h',
+        'media/simple_data_source.cc',
+        'media/simple_data_source.h',
+        'media/video_renderer_impl.cc',
+        'media/video_renderer_impl.h',
+        'media/web_video_renderer.h',
+        'plugins/carbon_plugin_window_tracker_mac.h',
+        'plugins/carbon_plugin_window_tracker_mac.cc',
+        'plugins/coregraphics_private_symbols_mac.h',
+        'plugins/nphostapi.h',
+        'plugins/gtk_plugin_container.h',
+        'plugins/gtk_plugin_container.cc',
+        'plugins/gtk_plugin_container_manager.h',
+        'plugins/gtk_plugin_container_manager.cc',
+        'plugins/npapi_extension_thunk.cc',
+        'plugins/npapi_extension_thunk.h',
+        'plugins/plugin_constants_win.h',
+        'plugins/plugin_host.cc',
+        'plugins/plugin_host.h',
+        'plugins/plugin_instance.cc',
+        'plugins/plugin_instance.h',
+        'plugins/plugin_instance_mac.mm',
+        'plugins/plugin_lib.cc',
+        'plugins/plugin_lib.h',
+        'plugins/plugin_lib_mac.mm',
+        'plugins/plugin_lib_posix.cc',
+        'plugins/plugin_lib_win.cc',
+        'plugins/plugin_list.cc',
+        'plugins/plugin_list.h',
+        'plugins/plugin_list_mac.mm',
+        'plugins/plugin_list_posix.cc',
+        'plugins/plugin_list_win.cc',
+        'plugins/plugin_stream.cc',
+        'plugins/plugin_stream.h',
+        'plugins/plugin_stream_posix.cc',
+        'plugins/plugin_stream_url.cc',
+        'plugins/plugin_stream_url.h',
+        'plugins/plugin_stream_win.cc',
+        'plugins/plugin_string_stream.cc',
+        'plugins/plugin_string_stream.h',
+        'plugins/plugin_stubs.cc',
+        'plugins/webplugin_2d_device_delegate.h',
+        'plugins/webplugin_3d_device_delegate.h',
+        'plugins/webplugin_delegate_impl.cc',
+        'plugins/webplugin_delegate_impl.h',
+        'plugins/webplugin_delegate_impl_gtk.cc',
+        'plugins/webplugin_delegate_impl_mac.mm',
+        'plugins/webplugin_delegate_impl_win.cc',
+        'alt_error_page_resource_fetcher.cc',
+        'alt_error_page_resource_fetcher.h',
+        'context_menu.h',
+        'cpp_binding_example.cc',
+        'cpp_binding_example.h',
+        'cpp_bound_class.cc',
+        'cpp_bound_class.h',
+        'cpp_variant.cc',
+        'cpp_variant.h',
+        'dom_operations.cc',
+        'dom_operations.h',
+        'form_data.h',
+        'form_field.cc',
+        'form_field.h',
+        'form_field_values.cc',
+        'form_field_values.h',
+        'ftp_directory_listing_response_delegate.cc',
+        'ftp_directory_listing_response_delegate.h',
+        'glue_serialize.cc',
+        'glue_serialize.h',
+        'image_decoder.cc',
+        'image_decoder.h',
+        'image_resource_fetcher.cc',
+        'image_resource_fetcher.h',
+        'multipart_response_delegate.cc',
+        'multipart_response_delegate.h',
+        'npruntime_util.cc',
+        'npruntime_util.h',
+        'password_form.h',
+        'password_form_dom_manager.cc',
+        'password_form_dom_manager.h',
+        'resource_fetcher.cc',
+        'resource_fetcher.h',
+        'resource_loader_bridge.cc',
+        'resource_loader_bridge.h',
+        'resource_type.h',
+        'scoped_clipboard_writer_glue.h',
+        'simple_webmimeregistry_impl.cc',
+        'simple_webmimeregistry_impl.h',
+        'webaccessibility.cc',
+        'webaccessibility.h',
+        'webclipboard_impl.cc',
+        'webclipboard_impl.h',
+        'webcookie.h',
+        'webcursor.cc',
+        'webcursor.h',
+        'webcursor_gtk.cc',
+        'webcursor_gtk_data.h',
+        'webcursor_mac.mm',
+        'webcursor_win.cc',
+        'webdropdata.cc',
+        'webdropdata_win.cc',
+        'webdropdata.h',
+        'webkit_glue.cc',
+        'webkit_glue.h',
+        'webkitclient_impl.cc',
+        'webkitclient_impl.h',
+        'webmediaplayer_impl.h',
+        'webmediaplayer_impl.cc',
+        'webmenuitem.h',
+        'webmenurunner_mac.h',
+        'webmenurunner_mac.mm',
+        'webpasswordautocompletelistener_impl.cc',
+        'webpasswordautocompletelistener_impl.h',
+        'webplugin.cc',
+        'webplugin.h',
+        'webplugin_delegate.h',
+        'webplugin_impl.cc',
+        'webplugin_impl.h',
+        'webplugininfo.h',
+        'webpreferences.cc',
+        'webpreferences.h',
+        'websocketstreamhandle_bridge.h',
+        'websocketstreamhandle_delegate.h',
+        'websocketstreamhandle_impl.cc',
+        'websocketstreamhandle_impl.h',
+        'webthemeengine_impl_win.cc',
+        'weburlloader_impl.cc',
+        'weburlloader_impl.h',
+        'window_open_disposition.h',
+        'window_open_disposition.cc',
+
+        # These files used to be built in the webcore target, but moved here
+        # since part of glue.
+        '../extensions/v8/benchmarking_extension.cc',
+        '../extensions/v8/benchmarking_extension.h',
+        '../extensions/v8/gc_extension.cc',
+        '../extensions/v8/gc_extension.h',
+        '../extensions/v8/gears_extension.cc',
+        '../extensions/v8/gears_extension.h',
+        '../extensions/v8/heap_profiler_extension.cc',
+        '../extensions/v8/heap_profiler_extension.h',
+        '../extensions/v8/interval_extension.cc',
+        '../extensions/v8/interval_extension.h',
+        '../extensions/v8/playback_extension.cc',
+        '../extensions/v8/playback_extension.h',
+        '../extensions/v8/profiler_extension.cc',
+        '../extensions/v8/profiler_extension.h',
+
+      ],
+      # When glue is a dependency, it needs to be a hard dependency.
+      # Dependents may rely on files generated by this target or one of its
+      # own hard dependencies.
+      'hard_dependency': 1,
+      'conditions': [
+        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
+          'dependencies': [
+            '<(DEPTH)/build/linux/system.gyp:gtk',
+            '<(DEPTH)/base/base.gyp:linux_versioninfo',
+          ],
+          'sources!': [
+            'plugins/plugin_stubs.cc',
+          ],
+        }, { # else: OS!="linux" and OS!="freebsd" and OS!="openbsd" \
+             # and OS!="solaris"'
+          'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'],
+                       ['exclude', r'/gtk_']],
+        }],
+        ['OS!="mac"', {
+          'sources/': [['exclude', '_mac\\.(cc|mm)$']],
+        }, {  # else: OS=="mac"
+          'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']],
+          'link_settings': {
+            'libraries': [
+              '$(SDKROOT)/QuartzCore.framework',
+            ],
+          },
+        }],
+        ['enable_gpu==1 and inside_chromium_build==1', {
+          'dependencies': [
+            '<(DEPTH)/gpu/gpu.gyp:gpu_plugin',
+          ],
+        }],
+        ['OS!="win"', {
+          'sources/': [['exclude', '_win\\.cc$']],
+          'sources!': [
+            # These files are Windows-only now but may be ported to other
+            # platforms.
+            'webaccessibility.cc',
+            'webaccessibility.h',
+            'webthemeengine_impl_win.cc',
+          ],
+        }, {  # else: OS=="win"
+          'sources/': [['exclude', '_posix\\.cc$']],
+          'include_dirs': [
+            '<(DEPTH)/third_party/wtl/include',
+          ],
+          'dependencies': [
+            '<(DEPTH)/build/win/system.gyp:cygwin',
+            '<(DEPTH)/webkit/default_plugin/default_plugin.gyp:default_plugin',
+          ],
+          'sources!': [
+            'plugins/plugin_stubs.cc',
+          ],
+        }],
+      ],
+    },
+  ],
+}
diff --git a/webkit/support/webkit_support.gyp b/webkit/support/webkit_support.gyp
index 8853b6c..be19855 100644
--- a/webkit/support/webkit_support.gyp
+++ b/webkit/support/webkit_support.gyp
@@ -6,6 +6,9 @@
   # Suppose this file is put at WebKit/WebKit/chromium/webkit/support/.
   'includes': [
     '../../features.gypi',
+    '../appcache/webkit_appcache.gypi',
+    '../database/webkit_database.gypi',
+    '../glue/webkit_glue.gypi',
     'webkit_support.gypi',
   ],
 }
diff --git a/webkit/support/webkit_support.gypi b/webkit/support/webkit_support.gypi
index cc8cc02..d6eaf04 100644
--- a/webkit/support/webkit_support.gypi
+++ b/webkit/support/webkit_support.gypi
@@ -10,9 +10,9 @@
       'dependencies': [
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/skia/skia.gyp:skia',
-        '<(DEPTH)/webkit/webkit.gyp:appcache',
-        '<(DEPTH)/webkit/webkit.gyp:database',
-        '<(DEPTH)/webkit/webkit.gyp:glue',
+        'appcache',
+        'database',
+        'glue',
       ],
       'sources': [
         'test_webkit_client.cc',
diff --git a/webkit/webkit.gyp b/webkit/webkit.gyp
index e1401a9..e03c5dd 100644
--- a/webkit/webkit.gyp
+++ b/webkit/webkit.gyp
@@ -1,4 +1,4 @@
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -7,6 +7,9 @@
     '../third_party/WebKit/WebKit/chromium/features.gypi',
     '../third_party/WebKit/WebKit/chromium/WebKit.gypi',
     '../third_party/WebKit/WebCore/WebCore.gypi',
+    'appcache/webkit_appcache.gypi',
+    'database/webkit_database.gypi',
+    'glue/webkit_glue.gypi',
     'support/webkit_support.gypi',
     'tools/test_shell/test_shell.gypi',
   ],
@@ -34,9 +37,6 @@
     ],
 
     'debug_devtools%': 0,
-
-    'grit_info_cmd': ['python', '../tools/grit/grit_info.py'],
-    'grit_cmd': ['python', '../tools/grit/grit.py'],
   },
   'targets': [
     {
@@ -47,414 +47,6 @@
       ],
     },
     {
-      'target_name': 'webkit_resources',
-      'type': 'none',
-      'msvs_guid': '0B469837-3D46-484A-AFB3-C5A6C68730B9',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
-      },
-      'actions': [
-        {
-          'action_name': 'webkit_resources',
-          'variables': {
-            'input_path': 'glue/webkit_resources.grd',
-          },
-          'inputs': [
-            '<!@(<(grit_info_cmd) --inputs <(input_path))',
-          ],
-          'outputs': [
-            '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
-          ],
-          'action': ['<@(grit_cmd)',
-                     '-i', '<(input_path)', 'build',
-                     '-o', '<(grit_out_dir)'],
-          'message': 'Generating resources from <(input_path)',
-        },
-        {
-          'action_name': 'webkit_chromium_resources',
-          'variables': {
-            'input_path': '../third_party/WebKit/WebKit/chromium/WebKit.grd',
-          },
-          'inputs': [
-            '<!@(<(grit_info_cmd) --inputs <(input_path))',
-          ],
-          'outputs': [
-            '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
-          ],
-          'action': ['<@(grit_cmd)',
-                     '-i', '<(input_path)', 'build',
-                     '-o', '<(grit_out_dir)'],
-          'message': 'Generating resources from <(input_path)',
-        },
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)/webkit',
-        ],
-      },
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': ['../build/win/system.gyp:cygwin'],
-        }],
-      ],
-    },
-    {
-      'target_name': 'webkit_strings',
-      'type': 'none',
-      'msvs_guid': '60B43839-95E6-4526-A661-209F16335E0E',
-      'variables': {
-        'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/webkit',
-      },
-      'actions': [
-        {
-          'action_name': 'webkit_strings',
-          'variables': {
-            'input_path': 'glue/webkit_strings.grd',
-          },
-          'inputs': [
-            '<!@(<(grit_info_cmd) --inputs <(input_path))',
-          ],
-          'outputs': [
-            '<!@(<(grit_info_cmd) --outputs \'<(grit_out_dir)\' <(input_path))',
-          ],
-          'action': ['<@(grit_cmd)',
-                     '-i', '<(input_path)', 'build',
-                     '-o', '<(grit_out_dir)'],
-          'message': 'Generating resources from <(input_path)',
-        },
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)/webkit',
-        ],
-      },
-      'conditions': [
-        ['OS=="win"', {
-          'dependencies': ['../build/win/system.gyp:cygwin'],
-        }],
-      ],
-    },
-    {
-      'target_name': 'appcache',
-      'type': '<(library)',
-      'msvs_guid': '0B945915-31A7-4A07-A5B5-568D737A39B1',
-      'dependencies': [
-        '../app/app.gyp:app_base',
-        '../net/net.gyp:net',
-      ],
-      'sources': [
-        # This list contains all .h and .cc in appcache except for test code.
-        'appcache/appcache.cc',
-        'appcache/appcache.h',
-        'appcache/appcache_backend_impl.cc',
-        'appcache/appcache_backend_impl.h',
-        'appcache/appcache_database.cc',
-        'appcache/appcache_database.h',
-        'appcache/appcache_entry.h',
-        'appcache/appcache_frontend_impl.cc',
-        'appcache/appcache_frontend_impl.h',
-        'appcache/appcache_group.cc',
-        'appcache/appcache_group.h',
-        'appcache/appcache_host.cc',
-        'appcache/appcache_host.h',
-        'appcache/appcache_interceptor.cc',
-        'appcache/appcache_interceptor.h',
-        'appcache/appcache_interfaces.cc',
-        'appcache/appcache_interfaces.h',
-        'appcache/appcache_policy.h',
-        'appcache/appcache_request_handler.cc',
-        'appcache/appcache_request_handler.h',
-        'appcache/appcache_response.cc',
-        'appcache/appcache_response.h',
-        'appcache/appcache_service.cc',
-        'appcache/appcache_service.h',
-        'appcache/appcache_storage.cc',
-        'appcache/appcache_storage.h',
-        'appcache/appcache_storage_impl.cc',
-        'appcache/appcache_storage_impl.h',
-        'appcache/appcache_thread.cc',
-        'appcache/appcache_thread.h',
-        'appcache/appcache_working_set.cc',
-        'appcache/appcache_working_set.h',
-        'appcache/appcache_update_job.cc',
-        'appcache/appcache_update_job.h',
-        'appcache/appcache_url_request_job.cc',
-        'appcache/appcache_url_request_job.h',
-        'appcache/manifest_parser.cc',
-        'appcache/manifest_parser.h',
-        'appcache/mock_appcache_storage.cc',
-        'appcache/mock_appcache_storage.h',
-        'appcache/web_application_cache_host_impl.cc',
-        'appcache/web_application_cache_host_impl.h',
-      ],
-    },
-    {
-      'target_name': 'database',
-      'type': '<(library)',
-      'msvs_guid': '1DA00DDD-44E5-4C56-B2CC-414FB0164492',
-      'dependencies': [
-        '../app/app.gyp:app_base',
-        '../base/base.gyp:base',
-        '../third_party/sqlite/sqlite.gyp:sqlite',
-      ],
-      'sources': [
-        'database/databases_table.cc',
-        'database/databases_table.h',
-        'database/database_connections.cc',
-        'database/database_connections.h',
-        'database/database_tracker.cc',
-        'database/database_tracker.h',
-        'database/database_util.cc',
-        'database/database_util.h',
-        'database/quota_table.cc',
-        'database/quota_table.h',
-        'database/vfs_backend.cc',
-        'database/vfs_backend.h',
-      ],
-    },
-    {
-      'target_name': 'glue',
-      'type': '<(library)',
-      'msvs_guid': 'C66B126D-0ECE-4CA2-B6DC-FA780AFBBF09',
-      'dependencies': [
-        '../app/app.gyp:app_base',
-        '../net/net.gyp:net',
-        '../third_party/WebKit/WebCore/WebCore.gyp/WebCore.gyp:webcore',
-        'webkit_resources',
-        'webkit_strings',
-      ],
-      'actions': [
-        {
-          'action_name': 'webkit_version',
-          'inputs': [
-            'build/webkit_version.py',
-            '../third_party/WebKit/WebCore/Configurations/Version.xcconfig',
-          ],
-          'outputs': [
-            '<(INTERMEDIATE_DIR)/webkit_version.h',
-          ],
-          'action': ['python', '<@(_inputs)', '<(INTERMEDIATE_DIR)'],
-        },
-      ],
-      'include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)/webkit',
-      ],
-      'sources': [
-        # This list contains all .h, .cc, and .mm files in glue except for
-        # those in the test subdirectory and those with unittest in in their
-        # names.
-        'glue/devtools_message_data.cc',
-        'glue/devtools_message_data.h',
-        'glue/media/buffered_data_source.cc',
-        'glue/media/buffered_data_source.h',
-        'glue/media/media_resource_loader_bridge_factory.cc',
-        'glue/media/media_resource_loader_bridge_factory.h',
-        'glue/media/simple_data_source.cc',
-        'glue/media/simple_data_source.h',
-        'glue/media/video_renderer_impl.cc',
-        'glue/media/video_renderer_impl.h',
-        'glue/media/web_video_renderer.h',
-        'glue/plugins/carbon_plugin_window_tracker_mac.h',
-        'glue/plugins/carbon_plugin_window_tracker_mac.cc',
-        'glue/plugins/coregraphics_private_symbols_mac.h',
-        'glue/plugins/nphostapi.h',
-        'glue/plugins/gtk_plugin_container.h',
-        'glue/plugins/gtk_plugin_container.cc',
-        'glue/plugins/gtk_plugin_container_manager.h',
-        'glue/plugins/gtk_plugin_container_manager.cc',
-        'glue/plugins/npapi_extension_thunk.cc',
-        'glue/plugins/npapi_extension_thunk.h',
-        'glue/plugins/plugin_constants_win.h',
-        'glue/plugins/plugin_host.cc',
-        'glue/plugins/plugin_host.h',
-        'glue/plugins/plugin_instance.cc',
-        'glue/plugins/plugin_instance.h',
-        'glue/plugins/plugin_instance_mac.mm',
-        'glue/plugins/plugin_lib.cc',
-        'glue/plugins/plugin_lib.h',
-        'glue/plugins/plugin_lib_mac.mm',
-        'glue/plugins/plugin_lib_posix.cc',
-        'glue/plugins/plugin_lib_win.cc',
-        'glue/plugins/plugin_list.cc',
-        'glue/plugins/plugin_list.h',
-        'glue/plugins/plugin_list_mac.mm',
-        'glue/plugins/plugin_list_posix.cc',
-        'glue/plugins/plugin_list_win.cc',
-        'glue/plugins/plugin_stream.cc',
-        'glue/plugins/plugin_stream.h',
-        'glue/plugins/plugin_stream_posix.cc',
-        'glue/plugins/plugin_stream_url.cc',
-        'glue/plugins/plugin_stream_url.h',
-        'glue/plugins/plugin_stream_win.cc',
-        'glue/plugins/plugin_string_stream.cc',
-        'glue/plugins/plugin_string_stream.h',
-        'glue/plugins/plugin_stubs.cc',
-        'glue/plugins/webplugin_2d_device_delegate.h',
-        'glue/plugins/webplugin_3d_device_delegate.h',
-        'glue/plugins/webplugin_delegate_impl.cc',
-        'glue/plugins/webplugin_delegate_impl.h',
-        'glue/plugins/webplugin_delegate_impl_gtk.cc',
-        'glue/plugins/webplugin_delegate_impl_mac.mm',
-        'glue/plugins/webplugin_delegate_impl_win.cc',
-        'glue/alt_error_page_resource_fetcher.cc',
-        'glue/alt_error_page_resource_fetcher.h',
-        'glue/context_menu.h',
-        'glue/cpp_binding_example.cc',
-        'glue/cpp_binding_example.h',
-        'glue/cpp_bound_class.cc',
-        'glue/cpp_bound_class.h',
-        'glue/cpp_variant.cc',
-        'glue/cpp_variant.h',
-        'glue/dom_operations.cc',
-        'glue/dom_operations.h',
-        'glue/form_data.h',
-        'glue/form_field.cc',
-        'glue/form_field.h',
-        'glue/form_field_values.cc',
-        'glue/form_field_values.h',
-        'glue/ftp_directory_listing_response_delegate.cc',
-        'glue/ftp_directory_listing_response_delegate.h',
-        'glue/glue_serialize.cc',
-        'glue/glue_serialize.h',
-        'glue/image_decoder.cc',
-        'glue/image_decoder.h',
-        'glue/image_resource_fetcher.cc',
-        'glue/image_resource_fetcher.h',
-        'glue/multipart_response_delegate.cc',
-        'glue/multipart_response_delegate.h',
-        'glue/npruntime_util.cc',
-        'glue/npruntime_util.h',
-        'glue/password_form.h',
-        'glue/password_form_dom_manager.cc',
-        'glue/password_form_dom_manager.h',
-        'glue/resource_fetcher.cc',
-        'glue/resource_fetcher.h',
-        'glue/resource_loader_bridge.cc',
-        'glue/resource_loader_bridge.h',
-        'glue/resource_type.h',
-        'glue/scoped_clipboard_writer_glue.h',
-        'glue/simple_webmimeregistry_impl.cc',
-        'glue/simple_webmimeregistry_impl.h',
-        'glue/webaccessibility.cc',
-        'glue/webaccessibility.h',
-        'glue/webclipboard_impl.cc',
-        'glue/webclipboard_impl.h',
-        'glue/webcookie.h',
-        'glue/webcursor.cc',
-        'glue/webcursor.h',
-        'glue/webcursor_gtk.cc',
-        'glue/webcursor_gtk_data.h',
-        'glue/webcursor_mac.mm',
-        'glue/webcursor_win.cc',
-        'glue/webdropdata.cc',
-        'glue/webdropdata_win.cc',
-        'glue/webdropdata.h',
-        'glue/webkit_glue.cc',
-        'glue/webkit_glue.h',
-        'glue/webkitclient_impl.cc',
-        'glue/webkitclient_impl.h',
-        'glue/webmediaplayer_impl.h',
-        'glue/webmediaplayer_impl.cc',
-        'glue/webmenuitem.h',
-        'glue/webmenurunner_mac.h',
-        'glue/webmenurunner_mac.mm',
-        'glue/webpasswordautocompletelistener_impl.cc',
-        'glue/webpasswordautocompletelistener_impl.h',
-        'glue/webplugin.cc',
-        'glue/webplugin.h',
-        'glue/webplugin_delegate.h',
-        'glue/webplugin_impl.cc',
-        'glue/webplugin_impl.h',
-        'glue/webplugininfo.h',
-        'glue/webpreferences.cc',
-        'glue/webpreferences.h',
-        'glue/websocketstreamhandle_bridge.h',
-        'glue/websocketstreamhandle_delegate.h',
-        'glue/websocketstreamhandle_impl.cc',
-        'glue/websocketstreamhandle_impl.h',
-        'glue/webthemeengine_impl_win.cc',
-        'glue/weburlloader_impl.cc',
-        'glue/weburlloader_impl.h',
-        'glue/window_open_disposition.h',
-        'glue/window_open_disposition.cc',
-
-        # These files used to be built in the webcore target, but moved here
-        # since part of glue.
-        'extensions/v8/benchmarking_extension.cc',
-        'extensions/v8/benchmarking_extension.h',
-        'extensions/v8/gc_extension.cc',
-        'extensions/v8/gc_extension.h',
-        'extensions/v8/gears_extension.cc',
-        'extensions/v8/gears_extension.h',
-        'extensions/v8/heap_profiler_extension.cc',
-        'extensions/v8/heap_profiler_extension.h',
-        'extensions/v8/interval_extension.cc',
-        'extensions/v8/interval_extension.h',
-        'extensions/v8/playback_extension.cc',
-        'extensions/v8/playback_extension.h',
-        'extensions/v8/profiler_extension.cc',
-        'extensions/v8/profiler_extension.h',
-
-      ],
-      # When glue is a dependency, it needs to be a hard dependency.
-      # Dependents may rely on files generated by this target or one of its
-      # own hard dependencies.
-      'hard_dependency': 1,
-      'conditions': [
-        ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="solaris"', {
-          'dependencies': [
-            '../build/linux/system.gyp:gtk',
-            '../base/base.gyp:linux_versioninfo',
-          ],
-          'sources!': [
-            'glue/plugins/plugin_stubs.cc',
-          ],
-        }, { # else: OS!="linux" and OS!="freebsd" and OS!="openbsd" \
-             # and OS!="solaris"'
-          'sources/': [['exclude', '_(linux|gtk)(_data)?\\.cc$'],
-                       ['exclude', r'/gtk_']],
-        }],
-        ['OS!="mac"', {
-          'sources/': [['exclude', '_mac\\.(cc|mm)$']],
-        }, {  # else: OS=="mac"
-          'sources/': [['exclude', 'plugin_(lib|list)_posix\\.cc$']],
-          'link_settings': { 
-            'libraries': [
-              '$(SDKROOT)/QuartzCore.framework', 
-            ], 
-          },
-        }],
-        ['enable_gpu==1', {
-          'dependencies': [
-            '../gpu/gpu.gyp:gpu_plugin',
-          ],
-        }],
-        ['OS!="win"', {
-          'sources/': [['exclude', '_win\\.cc$']],
-          'sources!': [
-            # These files are Windows-only now but may be ported to other
-            # platforms.
-            'glue/webaccessibility.cc',
-            'glue/webaccessibility.h',
-            'glue/webthemeengine_impl_win.cc',
-          ],
-        }, {  # else: OS=="win"
-          'sources/': [['exclude', '_posix\\.cc$']],
-          'include_dirs': [
-            '<(DEPTH)/third_party/wtl/include',
-          ],
-          'dependencies': [
-            '../build/win/system.gyp:cygwin',
-            'default_plugin/default_plugin.gyp:default_plugin',
-          ],
-          'sources!': [
-            'glue/plugins/plugin_stubs.cc',
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'inspector_resources',
       'type': 'none',
       'msvs_guid': '5330F8EE-00F5-D65C-166E-E3150171055D',