Move chrome_version_info target into chrome_common.

chrome/chrome_common.gypi

Index: chrome/chrome_common.gypi
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 82d8bd4b769bfe2ea2c07b04d81261f4d5908a6b..01c7b59b4046bac5daaa71950c504974a114e5b6 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -122,6 +122,68 @@
   },
   'targets': [
     {
+      'target_name': 'chrome_version_info',
+      'type': '<(library)',
+      'sources': [
+        'common/chrome_version_info.cc',
+        'common/chrome_version_info.h',
+      ],
+      'include_dirs': [
+        '<(DEPTH)',
+      ],
+      'conditions': [
+        [ 'OS == "linux" or OS == "freebsd" or OS == "openbsd" or OS == "solaris"', {
+          'include_dirs': [
+            '<(SHARED_INTERMEDIATE_DIR)',
+          ],
+          'actions': [
+            {
+              'action_name': 'posix_version',
+              'variables': {
+                'lastchange_path':
+                  '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
+                'version_py_path': 'tools/build/version.py',
+                'version_path': 'VERSION',
+                'template_input_path': 'common/chrome_version_info_posix.h.version',
+              },
+              'conditions': [
+                [ 'branding == "Chrome"', {
+                  'variables': {
+                     'branding_path':
+                       'app/theme/google_chrome/BRANDING',
+                  },
+                }, { # else branding!="Chrome"
+                  'variables': {
+                     'branding_path':
+                       'app/theme/chromium/BRANDING',
+                  },
+                }],
+              ],
+              'inputs': [
+                '<(template_input_path)',
+                '<(version_path)',
+                '<(branding_path)',
+                '<(lastchange_path)',
+              ],
+              'outputs': [
+                '<(SHARED_INTERMEDIATE_DIR)/chrome/common/chrome_version_info_posix.h',
+              ],
+              'action': [
+                'python',
+                '<(version_py_path)',
+                '-f', '<(version_path)',
+                '-f', '<(branding_path)',
+                '-f', '<(lastchange_path)',
+                '<(template_input_path)',
+                '<@(_outputs)',
+              ],
+              'message': 'Generating version information',
+            },
+          ],
+        }],
+      ]
+    },
+    {
       'target_name': 'common',
       'type': '<(library)',
       'msvs_guid': '899F1280-3441-4D1F-BA04-CCD6208D9146',
@@ -143,6 +205,7 @@
         'chrome_strings',
         'common_constants',
         'common_net',
+        'chrome_version_info',
         'default_plugin/default_plugin.gyp:default_plugin',
         'theme_resources',
         '../app/app.gyp:app_base',
@@ -402,6 +465,7 @@
             # issue.
             'chrome_resources',
             'chrome_strings',
+            'chrome_version_info',

[gregoryd, 2010/08/20 22:03:28]

Since chrome_version_info generates a library from a cc file, it must have a
win64-specific target. common_nacl_win64 is a 64-bit target and cannot link with
the 32-bit chrome_version_info. I am puzzled by the fact that the trybot
succeeded.

[gregoryd, 2010/08/20 23:20:04]

I think the explanation is that it links fine also without this line. Please
remove it.

             'common_constants_win64',
             '../app/app.gyp:app_base_nacl_win64',
             '../app/app.gyp:app_resources',