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

Unified Diff: chrome_elf/BUILD.gn

Issue 2123443002: Revert of Switch chrome_elf exception handling from breakpad to crashpad (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months 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 | « chrome/install_static/install_util.cc ('k') | chrome_elf/DEPS » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_elf/BUILD.gn
diff --git a/chrome_elf/BUILD.gn b/chrome_elf/BUILD.gn
index e7d27b21482f69cddb9042748f08f2c221b8fbe3..a3ba1b4269f0da8b68f9819fd6f990c135427952 100644
--- a/chrome_elf/BUILD.gn
+++ b/chrome_elf/BUILD.gn
@@ -35,6 +35,7 @@
]
deps = [
":blacklist",
+ ":breakpad",
":chrome_elf_manifest",
":chrome_elf_resources",
":common",
@@ -44,7 +45,6 @@
"//components/crash/content/app",
"//components/crash/core/common",
"//content/public/common:result_codes",
- "//third_party/crashpad/crashpad/client:client",
]
configs += [ "//build/config/win:windowed" ]
configs -= [ "//build/config/win:console" ]
@@ -87,6 +87,21 @@
]
}
+source_set("breakpad") {
+ include_dirs = [ "$target_gen_dir" ]
+ sources = [
+ "breakpad.cc",
+ "breakpad.h",
+ ]
+ deps = [
+ ":common",
+ "//base",
+ "//breakpad:breakpad_handler",
+ "//chrome/common:version_header",
+ "//chrome/install_static:install_static_util",
+ ]
+}
+
source_set("dll_hash") {
deps = [
"//base",
@@ -114,19 +129,16 @@
"blacklist/blacklist.h",
"blacklist/blacklist_interceptions.cc",
"blacklist/blacklist_interceptions.h",
- "blacklist/crashpad_helper.cc",
- "blacklist/crashpad_helper.h",
]
public_deps = [
"//sandbox",
]
deps = [
+ ":breakpad",
":common",
":constants",
"//base",
"//chrome/install_static:install_static_util",
- "//components/crash/content/app",
- "//third_party/crashpad/crashpad/client:client",
]
}
@@ -191,18 +203,6 @@
"//build/config/sanitizers:deps",
"//chrome/install_static:install_static_util",
]
- ldflags = [
- "/NODEFAULTLIB:user32.lib",
- "/DELAYLOAD:dbghelp.dll",
- "/DELAYLOAD:ole32.dll",
- "/DELAYLOAD:psapi.dll",
- "/DELAYLOAD:rpcrt4.dll",
- "/DELAYLOAD:shell32.dll",
- "/DELAYLOAD:user32.dll",
- "/DELAYLOAD:winhttp.dll",
- "/DELAYLOAD:winmm.dll",
- "/DELAYLOAD:ws2_32.dll",
- ]
}
loadable_module("blacklist_test_dll_1") {
« no previous file with comments | « chrome/install_static/install_util.cc ('k') | chrome_elf/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698