components/crash.gypi - Issue 1416133003: Crashpad Windows: Use the Crashpad client instead of Breakpad on Windows

Unified Diff: components/crash.gypi

Issue 1416133003: Crashpad Windows: Use the Crashpad client instead of Breakpad on Windows (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

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: components/crash.gypi

diff --git a/components/crash.gypi b/components/crash.gypi

index 21af3bcb69523103d7af0b372063251aa8f5baf8..3ab5db4ce0d9cba10eead24003bb91894873c12a 100644

--- a/components/crash.gypi

+++ b/components/crash.gypi

@@ -94,34 +94,35 @@

# crash_component.

# This is a temporary base target that is depended on by both

- # crash_component and crash_component_breakpad_mac_to_be_deleted. It

- # provides everything common to both of those targets. For a short period,

- # there are two Mac crash component implementations. The new one uses a

- # Crashpad implementation and is used by Chrome. The old one uses a

- # Breakpad implementation and is used by content_shell. Consumers should

- # depend on the desired target. All three targets behave identically on

- # non-Mac. When content_shell and any other consumers are migrated to the

- # Crashpad implementation on Mac, crash_component will merge back into

- # this target, crash_component_non_mac, which will be renamed

- # crash_component. crash_component_breakpad_mac_to_be_deleted will be

- # deleted.

+ # crash_component and crash_component_breakpad_to_be_deleted. It

+ # provides everything common to both of those targets. For a short

+ # period, there are two Mac and Windows crash component

+ # implementations. The new one uses a Crashpad implementation and is

+ # used by Chrome. The old one uses a Breakpad implementation and is

+ # used by content_shell. Consumers should depend on the desired

+ # target. All three targets behave identically on non-Mac/-Windows.

+ # When content_shell and any other consumers are migrated to the

+ # Crashpad implementation on Mac/Windows, crash_component will merge

+ # back into this target, crash_component_non_mac_win, which will be

+ # renamed crash_component. crash_component_breakpad_to_be_deleted will

+ # be deleted.

# While this situation exists:

# Do not depend on this target directly! Depend on

- # crash_component_breakpad_mac_to_be_deleted for old Breakpad behavior on

+ # crash_component_breakpad_to_be_deleted for old Breakpad behavior on

# all platforms, or preferably, depend on crash_component to get Breakpad

- # everywhere except for Mac, where you will get Crashpad.

+ # everywhere except for Mac and Windows, where you will get Crashpad.

# GN version: //components/crash/content/app:app_non_mac

- 'target_name': 'crash_component_non_mac',

+ 'target_name': 'crash_component_non_mac_win',

'variables': {

'conditions': [

- ['OS == "ios" or OS == "mac"', {

+ ['OS == "ios" or OS == "mac" or OS == "win"', {

# On IOS there are no files compiled into the library, and we

# can't have libraries with zero objects.

- # For now, the same applies to Mac OS X, until this target merges

- # with crash_component.

+ # For now, the same applies to Mac OS X and Windows, until this

+ # target merges with crash_component.

'crash_component_target_type%': 'none',

}, {

'crash_component_target_type%': 'static_library',

@@ -133,8 +134,6 @@

'crash/content/app/breakpad_linux.cc',

'crash/content/app/breakpad_linux.h',

'crash/content/app/breakpad_linux_impl.h',

- 'crash/content/app/breakpad_win.cc',

- 'crash/content/app/breakpad_win.h',

'crash/content/app/hard_error_handler_win.cc',

'crash/content/app/hard_error_handler_win.h',

@@ -178,17 +177,17 @@

# GN version: //components/crash/content/app

# TODO(mark): https://crbug.com/466890: merge this target with

- # crash_component_non_mac.

+ # crash_component_non_mac_win.

# Most of this target is actually in its dependency,

- # crash_component_non_mac. See the comment in that target for an

+ # crash_component_non_mac_win. See the comment in that target for an

# explanation for the split. The split is temporary and the two targets

# will be unified again soon.

'target_name': 'crash_component',

'variables': {

'conditions': [

- ['OS != "mac" ', {

- # There are no source files on any platform but Mac OS X.

+ ['OS != "mac" and OS != "win"', {

+ # There are no source files except on Mac OS X and Windows.

'crash_component_target_type%': 'none',

}, {

'crash_component_target_type%': 'static_library',

@@ -197,17 +196,19 @@

'type': '<(crash_component_target_type)',

'sources': [

- 'crash/content/app/crashpad_mac.h',

+ 'crash/content/app/crashpad.cc',

+ 'crash/content/app/crashpad.h',

'crash/content/app/crashpad_mac.mm',

+ 'crash/content/app/crashpad_win.cc',

'dependencies': [

- 'crash_component_non_mac',

+ 'crash_component_non_mac_win',

'crash_component_lib',

'../base/base.gyp:base',

'defines': ['CRASH_IMPLEMENTATION'],

'conditions': [

- ['OS=="mac"', {

+ ['OS=="mac" or OS=="win"', {

'dependencies': [

'../third_party/crashpad/crashpad/client/client.gyp:crashpad_client',

@@ -217,18 +218,20 @@

{

# TODO(mark): https://crbug.com/466890: remove this target.

- # This is a temporary target provided for Mac Breakpad users that have not

- # yet migrated to Crashpad (namely content_shell). This target will be

- # removed shortly and all consumers will be expected to use Crashpad as

- # the Mac crash-reporting client. See the comment in the

- # crash_component_non_mac target for more details.

+ # This is a temporary target provided for Mac and Windows Breakpad

+ # users that have not yet migrated to Crashpad (namely content_shell).

+ # This target will be removed shortly and all consumers will be

+ # expected to use Crashpad as the Mac and Windows crash-reporting

+ # client. See the comment in the crash_component_non_mac_win target

+ # for more details.

# GN version: //components/crash/content/app:app_breakpad_mac_to_be_deleted

- 'target_name': 'crash_component_breakpad_mac_to_be_deleted',

+ 'target_name': 'crash_component_breakpad_to_be_deleted',

'variables': {

'conditions': [

- ['OS != "mac" ', {

- # There are no source files on any platform but Mac OS X.

+ ['OS != "mac" and OS != "win"', {

+ # There are no source files on any platform but Mac OS X and

+ # Windows.

'crash_component_target_type%': 'none',

}, {

'crash_component_target_type%': 'static_library',

@@ -239,9 +242,11 @@

'sources': [

'crash/content/app/breakpad_mac.h',

'crash/content/app/breakpad_mac.mm',

+ 'crash/content/app/breakpad_win.cc',

+ 'crash/content/app/breakpad_win.h',

'dependencies': [

- 'crash_component_non_mac',

+ 'crash_component_non_mac_win',

'crash_component_lib',

'defines': ['CRASH_IMPLEMENTATION'],

« chrome/app/main_dll_loader_win.cc ('K') | « chrome/common/chrome_paths.cc ('k') | components/crash/content/app/crashpad.h » ('j') | components/crash/content/app/crashpad.cc » ('J')