Split user agent code out of the 'glue' target

webkit/user_agent/webkit_user_agent.gypi

+# Copyright 2012 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',
+      }],
+    ],
+  },
+  'targets': [
+    {
+      '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',

[tony, 2012/09/05 17:45:24]

I'm confused by this target. In the description, you say this is used by
third_party/WebKit targets, but I see user_agent_util.h being included in
src/chrome.

I see that webkit_unit_tests depends on webkit_user_agent, but I think we can
drop that dependency (links for me on Linux in both components build and
non-components build).

Could we merge this into user_agent and export the functions?

[stuartmorgan, 2012/09/05 19:58:14]

Sorry, I should have explained better. It's included by *both* chrome/ and
third_party/WebKit (specifically, both
src/third_party/WebKit/Source/WebKit/chromium/WebKitUnitTests.gyp and
src/third_party/WebKit/Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp
depend directly on it).
I'm not sure how/if the component build system interacts with
third_party/WebKit. AFAICT, nothing in third_party/WebKit currently depends on a
<(component) target.

+      'type': 'static_library',
+      'dependencies': [
+        'webkit_version',
+        '<(DEPTH)/base/base.gyp:base_i18n',
+      ],
+      'sources': [
+        'user_agent_util.cc',
+        'user_agent_util.h',
+      ],
+    },
+    {
+      'target_name': 'user_agent',
+      'type': '<(component)',
+      'defines': [
+        'WEBKIT_USER_AGENT_IMPLEMENTATION',
+      ],
+      'dependencies': [
+        '<(DEPTH)/base/base.gyp:base_i18n',
+      ],
+      'sources': [
+        'user_agent.cc',
+        'user_agent.h',
+        'webkit_user_agent_export.h',
+      ],
+    },
+  ],
+}