Skip to content

Commit

Permalink
Roll breakpad 9992f5d9d..06029285343afc
Browse files Browse the repository at this point in the history
The following CL rolls breakpad with the following changes:

https://chromium.googlesource.com/breakpad/breakpad/src.git/+log/9992f5d9d..06029285343afc

$ git log 9992f5d9d..06029285343afc --reverse --format='%h %s'
8a41d1d Make EXC_BAD_ACCESS / EXC_I386_GPFLT print nicely in the processor
4044d7e Refactor sym_upload in tools to extract code into common/linux, and minor fixes to code calling libcurl. This change may be used to build a tool to dump and upload symbols with multi-thread.
95e51c6 Add the TID to the CallStack.
a62ccfd Support processing microdump for mips architecture
a67c33f Switch the Linux minidump writer to use MDCVInfoELF for CV data.
2225ad6 Rename stdio.h wrapper file to stdio_wrapper.h.
3cb3449 Remove unreferenced local variable which breaks build.
0602928 Added an option (-i) to have dump_syms output header information only.

R=jochen@chromium.org
BUG=561447

Review URL: https://codereview.chromium.org/1870833004

Cr-Commit-Position: refs/heads/master@{#386588}
  • Loading branch information
dyen authored and Commit bot committed Apr 12, 2016
1 parent f0cabf2 commit 0b715c6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 1 deletion.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ allowed_hosts = [

deps = {
'src/breakpad/src':
Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + '9992f5d9d02d052f09cc85f0a1e678cf576867e8',
Var('chromium_git') + '/breakpad/breakpad/src.git' + '@' + '06029285343afcbe246d512bd3400ebcbfdebbaa',

'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'),
Expand Down
11 changes: 11 additions & 0 deletions breakpad/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,12 @@ config("sender_config") {
include_dirs = [ "src" ]
}

config("breakpad_unittest_config") {
# One of the breakpad unit tests test that we can detect the proper build-id.
# We must override the build-id for this one target.
ldflags = [ "-Wl,--build-id=0x000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f" ]
}

# {micro,mini}dump_stackwalk and minidump_dump are tool-type executables
# that do not build on Windows.
if (!is_win) {
Expand Down Expand Up @@ -418,6 +424,8 @@ if (is_linux || is_android) {
sources = [
"src/common/linux/http_upload.cc",
"src/common/linux/http_upload.h",
"src/common/linux/symbol_upload.cc",
"src/common/linux/symbol_upload.h",
"src/tools/linux/symupload/sym_upload.cc",
]

Expand Down Expand Up @@ -690,6 +698,9 @@ if (is_linux || is_android) {
# linux_syscall_support.h hand written asm syscalls.
# See https://crbug.com/556393
configs -= [ "//build/config/compiler:clang_stackrealign" ]

# Add the breakpad unittest config at the end to override all configs.
configs += [ ":breakpad_unittest_config" ]
}

executable("linux_dumper_unittest_helper") {
Expand Down
11 changes: 11 additions & 0 deletions breakpad/breakpad.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,8 @@
'src/tools/linux/symupload/sym_upload.cc',
'src/common/linux/http_upload.cc',
'src/common/linux/http_upload.h',
'src/common/linux/symbol_upload.cc',
'src/common/linux/symbol_upload.h',
],
'include_dirs': [
'src',
Expand Down Expand Up @@ -688,6 +690,11 @@
'src/tools/linux/md2core/minidump_memory_range_unittest.cc',
],

# The build-id is required to test the minidump writer.
'ldflags': [
"-Wl,--build-id=0x000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f",
],

'include_dirs': [
'linux', # Use our copy of breakpad_googletest_includes.h
'src',
Expand All @@ -711,6 +718,10 @@
'isolate_file': 'breakpad_unittests.isolate',
},
'includes': [ '../build/android/test_runner.gypi' ],
'ldflags!': [
# We are overriding the build-id above so remove the default.
'-Wl,--build-id=sha1',
],
}],
['clang==1 and target_arch=="ia32"', {
'cflags!': [
Expand Down

0 comments on commit 0b715c6

Please sign in to comment.