summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--BUILD.gn4
-rw-r--r--breakpad/BUILD.gn4
2 files changed, 6 insertions, 2 deletions
diff --git a/BUILD.gn b/BUILD.gn
index e3feaf3..f24a8c6 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -106,8 +106,7 @@ group("root") {
]
if (!is_win) {
- # TODO(brettw) re-enable once this compiles reliably.
- #deps += [ "//breakpad:symupload" ]
+ deps += [ "//breakpad:symupload" ]
}
if (is_linux) {
@@ -157,6 +156,7 @@ group("root") {
# Fails on Android for unknown reasons.
"//third_party/flac",
+ "//breakpad:symupload",
# TODO(brettw) make Blink work on Android.
"//third_party/WebKit/public:all_blink",
diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn
index ef6a1ad..596aea6 100644
--- a/breakpad/BUILD.gn
+++ b/breakpad/BUILD.gn
@@ -343,6 +343,10 @@ if (is_linux && current_toolchain == host_toolchain) {
"src/tools/linux/dump_syms/dump_syms.cc",
]
+ # There are some warnings in this code.
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
+
# dwarf2reader.cc uses dynamic_cast. Because we don't typically
# don't support RTTI, we enable it for this single target. Since
# dump_syms doesn't share any object files with anything else,