Split user agent code out of the 'glue' target

webkit/glue/webkit_glue.gypi

Index: webkit/glue/webkit_glue.gypi
diff --git a/webkit/glue/webkit_glue.gypi b/webkit/glue/webkit_glue.gypi
index acf1019a67152b84ee9c51c928a1873526a03a5a..a0d1da95fad1079c75e1b244bdf98018776c38ad 100644
--- a/webkit/glue/webkit_glue.gypi
+++ b/webkit/glue/webkit_glue.gypi
@@ -66,53 +66,6 @@
       'includes': [ '../../build/grit_target.gypi' ],
     },
     {
-      'target_name': 'webkit_version',
-      'type': 'none',
-      'actions': [
-        {
-          'action_name': 'webkit_version',
-          'inputs': [
-            '<(script)',
-            '<(webkit_src_dir)<(version_file)',
-            '../../build/util/lastchange.py',  # Used by the script.
-          ],
-          'outputs': [
-            '<(SHARED_INTERMEDIATE_DIR)/webkit_version.h',
-          ],
-          'action': ['python', '<(script)', '<(webkit_src_dir)',
-                     '<(version_file)', '<(SHARED_INTERMEDIATE_DIR)'],
-          'variables': {
-            'script': '../build/webkit_version.py',
-            # version_file is a relative path from |webkit_src_dir| to
-            # the version file.  But gyp will eat the variable unless
-            # it looks like an absolute path, so write it like one and
-            # then use it carefully above.
-            'version_file': '/Source/WebCore/Configurations/Version.xcconfig',
-          },
-        },
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [
-          '<(SHARED_INTERMEDIATE_DIR)',
-        ],
-      },
-      # Dependents may rely on files generated by this target or one of its
-      # own hard dependencies.
-      'hard_dependency': 1,
-    },
-    {
-      'target_name': 'webkit_user_agent',
-      'type': 'static_library',
-      'dependencies': [
-        'webkit_version',
-        '<(DEPTH)/base/base.gyp:base_i18n',
-      ],
-      'sources': [
-        'user_agent.cc',
-        'user_agent.h',
-      ],
-    },
-    {
       'target_name': 'glue',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ -146,11 +99,11 @@
         'blob',
         'fileapi',
         'forms',
+        'user_agent',
         'webkit_base',
         'webkit_media',
         'webkit_resources',
         'webkit_strings',
-        'webkit_user_agent',
       ],
       'include_dirs': [
         '<(INTERMEDIATE_DIR)',