summaryrefslogtreecommitdiffstats
path: root/breakpad/BUILD.gn
diff options
context:
space:
mode:
authordpranke <dpranke@chromium.org>2014-11-19 20:58:50 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-20 04:59:06 +0000
commit6326e8d4fb73dc09ff104828fd0d82c32acc514e (patch)
tree2447b121b271d9626d328f11dfa8153cee11b7f2 /breakpad/BUILD.gn
parentfa4053cc550e8989991006ea59a171bc3dd8e6e3 (diff)
downloadchromium_src-6326e8d4fb73dc09ff104828fd0d82c32acc514e.zip
chromium_src-6326e8d4fb73dc09ff104828fd0d82c32acc514e.tar.gz
chromium_src-6326e8d4fb73dc09ff104828fd0d82c32acc514e.tar.bz2
Take #2 at re-enabling breakpad in the Mac GN build.
The previous version failed because we seem to have rolled in a new version of breakpad that had an unused function error in a target that was previously compiling fine w/ the chromium_code config. This patch marks the target (symupload) as no_chromium_code. TBR=brettw@chromium.org BUG=431177 Review URL: https://codereview.chromium.org/743813002 Cr-Commit-Position: refs/heads/master@{#304980}
Diffstat (limited to 'breakpad/BUILD.gn')
-rw-r--r--breakpad/BUILD.gn15
1 files changed, 9 insertions, 6 deletions
diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn
index 5372d2b..62ff49f 100644
--- a/breakpad/BUILD.gn
+++ b/breakpad/BUILD.gn
@@ -227,6 +227,9 @@ if (current_toolchain == host_toolchain && is_mac) {
]
libs = [ "Foundation.framework" ]
+
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
}
}
@@ -255,10 +258,9 @@ if (is_mac) {
configs += [ ":internal_config" ]
- # TODO(GYP): TODO(dpranke): Fix the compile for this.
- sources -= [
- "src/client/mac/handler/dynamic_images.cc",
- ]
+ # There are some warnings in this code.
+ configs -= [ "//build/config/compiler:chromium_code" ]
+ configs += [ "//build/config/compiler:no_chromium_code" ]
}
executable("crash_inspector") {
@@ -287,6 +289,8 @@ if (is_mac) {
# TODO(GYP) this target has some mac_bundle_resources stuff.
# executable("crash_report_sender") {
# }
+ group("crash_report_sender") {
+ }
config("breakpad_config") {
include_dirs = [ "src/client/apple/Framework" ]
@@ -313,8 +317,7 @@ if (is_mac) {
deps = [
":utilities",
":crash_inspector",
- # TODO(GYP): Make this link
- #":crash_report_sender",
+ ":crash_report_sender",
]
}