Build the user_agent target for iOS

webkit/user_agent/webkit_user_agent.gypi

Index: webkit/user_agent/webkit_user_agent.gypi
diff --git a/webkit/user_agent/webkit_user_agent.gypi b/webkit/user_agent/webkit_user_agent.gypi
index 06bef846e2b899ac114404e2ed42c4a2d864f006..7096bb4a19c9f9b7cd80124586e4098eef5b12c7 100644
--- a/webkit/user_agent/webkit_user_agent.gypi
+++ b/webkit/user_agent/webkit_user_agent.gypi
@@ -14,59 +14,79 @@
   },
   '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': 'user_agent',
       'type': '<(component)',
       'defines': [
         'WEBKIT_USER_AGENT_IMPLEMENTATION',
       ],
       'dependencies': [
-        'webkit_version',
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
-        '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
       ],
       'sources': [
         'user_agent.cc',
         'user_agent.h',
         'user_agent_util.cc',
+        'user_agent_util_ios.mm',
         'user_agent_util.h',
         'webkit_user_agent_export.h',
       ],
+      'conditions': [
+        ['OS == "ios"', {
+          # iOS has different user-agent construction utilities, since the
+          # version strings is not derived from webkit_version, and follows
+          # a different format.
+          'sources!': [
+            'user_agent_util.cc',
+          ],
+        }, {  # OS != "ios"
+          'dependencies': [
+            'webkit_version',
+            '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+          ],
+        }],
+      ],
     },
   ],
+  'conditions': [
+    ['OS != "ios"', {
+      '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,
+        },
+      ],
+    }],
+  ],
 }