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

Unified Diff: components/crash/content/app/BUILD.gn

Issue 1475213004: Revert of 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
« no previous file with comments | « components/crash.gypi ('k') | components/crash/content/app/crashpad.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/crash/content/app/BUILD.gn
diff --git a/components/crash/content/app/BUILD.gn b/components/crash/content/app/BUILD.gn
index 5bd0494644e80355414b110d52f046607f11804f..cc610d6c850f19d9c8e6edb2976d87987a90a737 100644
--- a/components/crash/content/app/BUILD.gn
+++ b/components/crash/content/app/BUILD.gn
@@ -28,27 +28,24 @@
# GYP version: components/crash.gypi:crash_component
source_set("app") {
sources = [
- "crashpad.h",
+ "crashpad_mac.h",
"crashpad_mac.mm",
- "crashpad_win.cc",
]
-
- if (is_mac || is_win) {
- sources += [ "crashpad.cc" ]
- }
defines = [ "CRASH_IMPLEMENTATION" ]
public_deps = [
- ":app_non_mac_win",
+ ":app_non_mac",
]
deps = [
"//base",
]
- deps += [ ":lib" ]
- if (is_mac || is_win) {
- deps += [ "//third_party/crashpad/crashpad/client" ]
+ if (is_mac) {
+ deps += [
+ ":lib",
+ "//third_party/crashpad/crashpad/client",
+ ]
}
}
@@ -74,7 +71,7 @@
# crash_component_breakpad_mac_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.
-source_set("app_non_mac_win") {
+source_set("app_non_mac") {
visibility = [
":*",
"//components/crash/content/browser",
@@ -82,6 +79,8 @@
sources = [
"breakpad_linux_impl.h",
+ "breakpad_win.cc",
+ "breakpad_win.h",
"hard_error_handler_win.cc",
"hard_error_handler_win.h",
]
@@ -133,17 +132,15 @@
# 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.
-source_set("app_breakpad_mac_win_to_be_deleted") {
+source_set("app_breakpad_mac_to_be_deleted") {
deps = [
- ":app_non_mac_win",
+ ":app_non_mac",
]
- if (is_mac || is_win) {
+ if (is_mac) {
sources = [
"breakpad_mac.h",
"breakpad_mac.mm",
- "breakpad_win.cc",
- "breakpad_win.h",
]
defines = [ "CRASH_IMPLEMENTATION" ]
@@ -152,18 +149,9 @@
":lib",
"//base",
"//base:base_static",
+ "//breakpad",
"//breakpad:client",
"//components/crash/core/common",
- "//content/public/common:result_codes",
- "//sandbox",
]
-
- if (is_mac) {
- deps += [ "//breakpad" ]
- }
-
- if (is_win) {
- deps += [ "//breakpad:breakpad_handler" ]
- }
}
}
« no previous file with comments | « components/crash.gypi ('k') | components/crash/content/app/crashpad.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698