Skip to content

Commit

Permalink
Roll src/breakpad/src 242fb9a:c80d211 (svn 1471:1495)
Browse files Browse the repository at this point in the history 
This is to catch up fixes to the Android microdump writer.

Summary of changes available at:
https://chromium.googlesource.com/external/google-breakpad/src/+log/242fb9a..e100989

e100989 Add user_regs_struct and user_fpsimd_struct for aarch64 on Android.
0ad58e6 Fix compile error with Windows clang.
bdb4b7c Fix inttypes format macros in src/processor/proc_maps_linux.cc
c80d211 Remove obsolete seccomp_unwinder for legacy (pre-BPF)  sandbox
6d74ba8 Fix proc_maps_linux compile for non-Linux
80cfa05 [microdump] Move microdump writes to the crash ring-buffer log
947c7e9 [microdump] Fix hw architecture indication in build fingerprint line
d4a6903 Add check for executable stack/heap when rating Linux exploitability.
68ad684 Add check to see if stack pointer is off the stack according to the
        memory mappings when rating Linux exploitability.
412d3cf Fix format specifier in proc maps to support 32-bit architectures.
5fa512b Actually remove removed files
9a19499 Remove some old unused code, add a missing include R=lei
        at https://codereview.chromium.org/1211963002
a601859 Fix format specifier in proc maps to support 32-bit architectures.
70e371c Allow Print() to be called by const instances of MinidumpLinuxMaps
        and MinidumpLinuxMapsList.
d95798e Change Print method of MinidumpLinuxMaps and MinidumpLinuxMapsList
        to print contents of /proc/<pid>/maps instead of just the files mapped
        to memory.
0f5bff6 Workaround for range map overlaps caused by Android package relocation.
f503948 Fix breakpad for arm on arm64
9f4a8ee Fix potential null pointer dereference.
b00176d Remove unnecessary dependencies.
5c7459a Add support for Linux memory mapping stream and remove ELF header
        usage when checking exploitability rating.
78eab62 Fix incorrect comment.
d5ca70c add aarch64 support to minidump-2-core
f9d81bb tests: InstructionPointerMemoryNullPointer: make it work under llvm
31916e7 Add ELF header analysis when checking for instruction pointer in code.

BUG=520075,512755,477444

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

Cr-Commit-Position: refs/heads/master@{#344561}
  • Loading branch information
@primiano
primiano authored and Commit bot committed Aug 20, 2015
1 parent f5367c6 commit 934c192
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 9 deletions.
2 changes: 1 addition & 1 deletion DEPS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ allowed_hosts = [

deps = {
'src/breakpad/src':
Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + '242fb9a38db6ba534b1f7daa341dd4d79171658b', # from svn revision 1471
Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + 'e100989d3776aa1a6bfa9453edca227a679e3a0c', # from svn revision 1495

'src/buildtools':
Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'),
Expand Down
7 changes: 3 additions & 4 deletions breakpad/BUILD.gn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,6 @@ if (current_toolchain == host_toolchain && !is_win) {
"src/processor/basic_code_modules.cc",
"src/processor/basic_code_modules.h",
"src/processor/basic_source_line_resolver.cc",
"src/processor/binarystream.cc",
"src/processor/binarystream.h",
"src/processor/call_stack.cc",
"src/processor/cfi_frame_info.cc",
"src/processor/cfi_frame_info.h",
Expand All @@ -67,6 +65,7 @@ if (current_toolchain == host_toolchain && !is_win) {
"src/processor/logging.h",
"src/processor/pathname_stripper.cc",
"src/processor/pathname_stripper.h",
"src/processor/proc_maps_linux.cc",
"src/processor/process_state.cc",
"src/processor/simple_symbol_supplier.cc",
"src/processor/simple_symbol_supplier.h",
Expand Down Expand Up @@ -191,6 +190,7 @@ if (current_toolchain == host_toolchain && !is_win) {
"src/processor/minidump_dump.cc",
"src/processor/pathname_stripper.cc",
"src/processor/pathname_stripper.h",
"src/processor/proc_maps_linux.cc",
]

configs += [ ":tools_config" ]
Expand Down Expand Up @@ -453,8 +453,6 @@ if (is_linux || is_android) {
"src/client/linux/crash_generation/crash_generation_client.cc",
"src/client/linux/crash_generation/crash_generation_client.h",
"src/client/linux/dump_writer_common/mapping_info.h",
"src/client/linux/dump_writer_common/seccomp_unwinder.cc",
"src/client/linux/dump_writer_common/seccomp_unwinder.h",
"src/client/linux/dump_writer_common/thread_info.cc",
"src/client/linux/dump_writer_common/thread_info.h",
"src/client/linux/dump_writer_common/ucontext_reader.cc",
Expand Down Expand Up @@ -545,6 +543,7 @@ if (is_linux || is_android) {
"src/processor/minidump.cc",
"src/processor/pathname_stripper.cc",
"src/processor/pathname_stripper.h",
"src/processor/proc_maps_linux.cc",
]

include_dirs = [
Expand Down
7 changes: 3 additions & 4 deletions breakpad/breakpad.gyp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,6 @@
'src/processor/basic_code_modules.cc',
'src/processor/basic_code_modules.h',
'src/processor/basic_source_line_resolver.cc',
'src/processor/binarystream.cc',
'src/processor/binarystream.h',
'src/processor/call_stack.cc',
'src/processor/cfi_frame_info.cc',
'src/processor/cfi_frame_info.h',
Expand All @@ -38,6 +36,7 @@
'src/processor/pathname_stripper.cc',
'src/processor/pathname_stripper.h',
'src/processor/process_state.cc',
'src/processor/proc_maps_linux.cc',
'src/processor/simple_symbol_supplier.cc',
'src/processor/simple_symbol_supplier.h',
'src/processor/source_line_resolver_base.cc',
Expand Down Expand Up @@ -157,6 +156,7 @@
'src/processor/minidump_dump.cc',
'src/processor/pathname_stripper.cc',
'src/processor/pathname_stripper.h',
'src/processor/proc_maps_linux.cc',
],
'conditions': [
['OS=="ios"', {
Expand Down Expand Up @@ -518,8 +518,6 @@
'src/client/linux/log/log.cc',
'src/client/linux/log/log.h',
'src/client/linux/dump_writer_common/mapping_info.h',
'src/client/linux/dump_writer_common/seccomp_unwinder.cc',
'src/client/linux/dump_writer_common/seccomp_unwinder.h',
'src/client/linux/dump_writer_common/thread_info.cc',
'src/client/linux/dump_writer_common/thread_info.h',
'src/client/linux/dump_writer_common/ucontext_reader.cc',
Expand Down Expand Up @@ -624,6 +622,7 @@
'src/processor/minidump.cc',
'src/processor/pathname_stripper.cc',
'src/processor/pathname_stripper.h',
'src/processor/proc_maps_linux.cc',
],

'include_dirs': [
Expand Down

0 comments on commit 934c192

Please sign in to comment.