chrome/chrome_installer.gypi - Issue 1478273003: Add an installer crash key for the currently installed version.

Unified Diff: chrome/chrome_installer.gypi

Issue 1478273003: Add an installer crash key for the currently installed version. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@installer_crash_keys_cmdline

Patch Set: Created 5 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: chrome/chrome_installer.gypi

diff --git a/chrome/chrome_installer.gypi b/chrome/chrome_installer.gypi

index e3bb3861fb7284460b3ec461a38d27a1fa93aa9c..3819154ed117eb1173f671a5637cba334a27e2fd 100644

--- a/chrome/chrome_installer.gypi

+++ b/chrome/chrome_installer.gypi

@@ -211,31 +211,19 @@

{

# 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',

@@ -249,20 +237,53 @@

'installer/setup/installer_crash_reporter_client.h',

'installer/setup/installer_crash_reporting.cc',

'installer/setup/installer_crash_reporting.h',

- 'installer/setup/setup.ico',

- 'installer/setup/setup.rc',

'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_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': {

@@ -323,9 +344,7 @@

'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',

@@ -335,12 +354,8 @@

'..',

'<(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',

@@ -356,26 +371,13 @@

'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': [

« no previous file with comments | « no previous file | chrome/installer/setup/install.cc » ('j') | chrome/installer/setup/installer_crash_reporting.cc » ('J')