Add an installer crash key for the currently installed version.

chrome/chrome_installer.gypi

 # Copyright (c) 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': {
     'lastchange_path': '../build/util/LASTCHANGE',
     'branding_dir': 'app/theme/<(branding_path_component)',
     'branding_dir_100': 'app/theme/default_100_percent/<(branding_path_component)',
   },
@@ skipping 193 matching lines @@
           'dependencies': [
             '<(DEPTH)/base/base.gyp:base',
           ],
           'sources': [
             'installer/launcher_support/chrome_launcher_support.cc',
             'installer/launcher_support/chrome_launcher_support.h',
           ],
         },
         {
           # GN version: //chrome/installer/setup
-          'target_name': 'setup',
-          'type': 'executable',
+          'target_name': 'setup_lib',
+          'type': 'static_library',
           'dependencies': [
             'installer_util',
             'installer_util_strings',
             '../base/base.gyp:base',
-            '../chrome/common_constants.gyp:common_constants',
-            '../chrome/common_constants.gyp:version_header',
-            '../chrome_elf/chrome_elf.gyp:chrome_elf_constants',
             '../components/components.gyp:crash_component',
-            '../rlz/rlz.gyp:rlz_lib',
-            '../third_party/zlib/zlib.gyp:zlib',
           ],
           'include_dirs': [
             '..',
             '<(INTERMEDIATE_DIR)',
-            '<(SHARED_INTERMEDIATE_DIR)/setup',
           ],
-          'direct_dependent_settings': {
-            'include_dirs': [
-              '<(SHARED_INTERMEDIATE_DIR)/setup',
-            ],
-          },
           'sources': [
-            '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_strings.rc',
             'installer/mini_installer/chrome.release',
             'installer/setup/app_launcher_installer.cc',
             'installer/setup/app_launcher_installer.h',
             'installer/setup/archive_patch_helper.cc',
             'installer/setup/archive_patch_helper.h',
             'installer/setup/install.cc',
             'installer/setup/install.h',
             'installer/setup/install_worker.cc',
             'installer/setup/install_worker.h',
             'installer/setup/installer_crash_reporter_client.cc',
             'installer/setup/installer_crash_reporter_client.h',
             'installer/setup/installer_crash_reporting.cc',
             'installer/setup/installer_crash_reporting.h',
+            'installer/setup/setup_constants.cc',
+            'installer/setup/setup_constants.h',
+            'installer/setup/setup_util.cc',
+            'installer/setup/setup_util.h',
+            'installer/setup/update_active_setup_version_work_item.cc',
+            'installer/setup/update_active_setup_version_work_item.h',
+          ],
+          'conditions': [
+            ['win_use_allocator_shim==1', {
+              'dependencies': [
+                '<(allocator_target)',
+              ],
+            }],
+          ],
+        },
+        {
+          # GN version: //chrome/installer/setup
+          'target_name': 'setup',
+          'type': 'executable',
+          'dependencies': [
+            'setup_lib',
+            '../chrome/common_constants.gyp:common_constants',
+            '../chrome/common_constants.gyp:version_header',
+            '../chrome_elf/chrome_elf.gyp:chrome_elf_constants',
+            '../rlz/rlz.gyp:rlz_lib',
+            '../third_party/zlib/zlib.gyp:zlib',
+          ],
+          'include_dirs': [
+            '..',
+            '<(INTERMEDIATE_DIR)',
+            '<(SHARED_INTERMEDIATE_DIR)/setup',
+          ],
+          'direct_dependent_settings': {
+            'include_dirs': [
+              '<(SHARED_INTERMEDIATE_DIR)/setup',
+            ],
+          },
+          'sources': [
+            '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_strings.rc',
             'installer/setup/setup.ico',
             'installer/setup/setup.rc',
-            'installer/setup/setup_constants.cc',
-            'installer/setup/setup_constants.h',
             'installer/setup/setup_exe_version.rc.version',
             'installer/setup/setup_main.cc',
             'installer/setup/setup_main.h',
             'installer/setup/setup_resource.h',
-            'installer/setup/setup_util.cc',
-            'installer/setup/setup_util.h',
             'installer/setup/uninstall.cc',
             'installer/setup/uninstall.h',
-            'installer/setup/update_active_setup_version_work_item.cc',
-            'installer/setup/update_active_setup_version_work_item.h',
           ],
           'msvs_settings': {
             'VCLinkerTool': {
               'SubSystem': '2',     # Set /SUBSYSTEM:WINDOWS
             },
             'VCManifestTool': {
               'AdditionalManifestFiles': [
                 '$(ProjectDir)\\installer\\setup\\setup.exe.manifest',
               ],
             },
@@ skipping 40 matching lines @@
                 '<(allocator_target)',
               ],
             }],
           ],
         },
         {
           # GN version: //chrome/installer/setup:setup_unittests
           'target_name': 'setup_unittests',
           'type': 'executable',
           'dependencies': [
-            'installer_util',
-            'installer_util_strings',
-            '../base/base.gyp:base',
+            'setup_lib',
             '../base/base.gyp:base_i18n',
             '../base/base.gyp:test_support_base',
             '../testing/gmock.gyp:gmock',
             '../testing/gtest.gyp:gtest',
           ],
           'include_dirs': [
             '..',
             '<(INTERMEDIATE_DIR)',
           ],
-          # TODO(robertshield): Move the items marked with "Move to lib"
-          # below into a separate lib and then link both setup.exe and
-          # setup_unittests.exe against that.
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome/installer/util/installer_util_strings.rc',
-            'installer/mini_installer/chrome.release',  # Move to lib
             'installer/mini_installer/appid.h',
             'installer/mini_installer/chrome_appid.cc',
             'installer/mini_installer/configuration.cc',
             'installer/mini_installer/configuration.h',
             'installer/mini_installer/configuration_test.cc',
             'installer/mini_installer/decompress.cc',
             'installer/mini_installer/decompress.h',
             'installer/mini_installer/decompress_test.cc',
             'installer/mini_installer/mini_installer_constants.cc',
             'installer/mini_installer/mini_installer_constants.h',
             'installer/mini_installer/mini_string.cc',
             'installer/mini_installer/mini_string.h',
             'installer/mini_installer/mini_string_test.cc',
             'installer/mini_installer/regkey.cc',
             'installer/mini_installer/regkey.h',
-            'installer/setup/app_launcher_installer.cc',  # Move to lib
-            'installer/setup/app_launcher_installer.h',  # Move to lib
-            'installer/setup/archive_patch_helper.cc',  # Move to lib
-            'installer/setup/archive_patch_helper.h',   # Move to lib
             'installer/setup/archive_patch_helper_unittest.cc',
-            'installer/setup/install.cc',               # Move to lib
-            'installer/setup/install.h',                # Move to lib
             'installer/setup/install_unittest.cc',
-            'installer/setup/install_worker.cc',        # Move to lib
-            'installer/setup/install_worker.h',         # Move to lib
             'installer/setup/install_worker_unittest.cc',
             'installer/setup/memory_unittest.cc',
             'installer/setup/run_all_unittests.cc',
-            'installer/setup/setup_constants.cc',       # Move to lib
-            'installer/setup/setup_constants.h',        # Move to lib
-            'installer/setup/setup_util.cc',
             'installer/setup/setup_util_unittest.cc',
             'installer/setup/setup_util_unittest.h',
-            'installer/setup/update_active_setup_version_work_item.cc',  # Move to lib
-            'installer/setup/update_active_setup_version_work_item.h',   # Move to lib
             'installer/setup/update_active_setup_version_work_item_unittest.cc',
           ],
           'conditions': [
             ['win_use_allocator_shim==1', {
               'dependencies': [
                 '<(allocator_target)',
               ],
             }],
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
@@ skipping 751 matching lines @@
             '../build/isolate.gypi',
           ],
           'sources': [
             'setup_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }