summaryrefslogtreecommitdiffstats
path: root/chrome/chrome_dll.gypi
diff options
context:
space:
mode:
authorscottmg <scottmg@chromium.org>2015-11-25 18:27:49 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-26 02:28:34 +0000
commite3d37e4b4a5683225ee5e2fa427a7129d64fce18 (patch)
tree0f620dfa25d55f65567c4b9f4ad137b4801deb30 /chrome/chrome_dll.gypi
parentf170638b5c333ef8220ff6ee7836efef7452ebd3 (diff)
downloadchromium_src-e3d37e4b4a5683225ee5e2fa427a7129d64fce18.zip
chromium_src-e3d37e4b4a5683225ee5e2fa427a7129d64fce18.tar.gz
chromium_src-e3d37e4b4a5683225ee5e2fa427a7129d64fce18.tar.bz2
Revert of Crashpad Windows: Use the Crashpad client instead of Breakpad on Windows (patchset #48 id:1160001 of https://codereview.chromium.org/1416133003/ )
Reason for revert: Some failing tests https://build.chromium.org/p/chromium.win/builders/Win7%20Tests%20%28dbg%29%281%29/builds/43485. Unclear why they didn't fail on trybots so I'm going to revert and investigate. Original issue's description: > Crashpad Windows: Use the Crashpad client instead of Breakpad on Windows > > Crashpad is always compiled into chrome and its handler is always > enabled. It only uploads in Official builds. > > On Windows, the crash handler is chrome.exe run with a > --crashpad-handler argument. This is due to concern about > incompatibilities of shipping an additional new different binary for AV, > firewalls, etc. > > Sample renderer crash/1aed2bc785e28995 > Sample browser: crash/66c822815474a5d8 > > See also http://crbug.com/427611 . > > R=mark@chromium.org,cpu@chromium.org > BUG=447073,546288, 456193 > > Committed: https://crrev.com/aaa2ff656f9fcabcbdd9e9964e3b2bdc8f5102ed > Cr-Commit-Position: refs/heads/master@{#361742} TBR=mark@chromium.org,cpu@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=447073,546288, 456193 Review URL: https://codereview.chromium.org/1476193002 Cr-Commit-Position: refs/heads/master@{#361797}
Diffstat (limited to 'chrome/chrome_dll.gypi')
-rw-r--r--chrome/chrome_dll.gypi13
1 files changed, 0 insertions, 13 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 09c93d5..0ea9690 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -123,9 +123,7 @@
],
'dependencies': [
'<@(chromium_browser_dependencies)',
- '../components/components.gyp:crash_component',
'../content/content.gyp:content_app_browser',
- '../third_party/crashpad/crashpad/handler/handler.gyp:crashpad_handler',
],
'conditions': [
['OS=="win"', {
@@ -165,8 +163,6 @@
],
'sources': [
'app/chrome_dll.rc',
- 'app/chrome_crash_reporter_client.cc',
- 'app/chrome_crash_reporter_client.h',
# ETW Manifest.
'<(SHARED_INTERMEDIATE_DIR)/base/trace_event/etw_manifest/chrome_events_win.rc',
@@ -354,8 +350,6 @@
},
'dependencies': [
'<@(chromium_child_dependencies)',
- '../components/components.gyp:browser_watcher_client',
- '../components/components.gyp:crash_component',
'../content/content.gyp:content_app_child',
'chrome_version_resources',
'policy_path_parser',
@@ -365,8 +359,6 @@
],
'sources': [
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/chrome_dll_version.rc',
- 'app/chrome_crash_reporter_client.cc',
- 'app/chrome_crash_reporter_client.h',
'app/chrome_main.cc',
'app/chrome_main_delegate.cc',
'app/chrome_main_delegate.h',
@@ -400,11 +392,6 @@
}],
]
}],
- ['OS=="win" and configuration_policy==1', {
- 'dependencies': [
- '<(DEPTH)/components/components.gyp:policy',
- ],
- }],
['enable_plugins==1', {
'dependencies': [
'../pdf/pdf.gyp:pdf',