Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1338)

Unified Diff: chrome/chrome_dll.gypi

Issue 1481703002: win: Move Crashpad all into chrome.exe (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: breakpad_dump_location, revert test change Created 5 years 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_dll.gypi
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 09c93d56fb5ba803df71d2ce1959345521f1f1e1..9e75323afada456d2e6035cf2c6f91b4b3a1744a 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',
@@ -304,6 +300,7 @@
'dependencies': [
'../components/components.gyp:crash_component',
'../components/components.gyp:policy',
+ '../third_party/crashpad/crashpad/handler/handler.gyp:crashpad_handler',
],
'sources': [
'app/chrome_crash_reporter_client.cc',
@@ -355,7 +352,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 +361,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',

Powered by Google App Engine
This is Rietveld 408576698