From 581bec84d7658893cdb0779243a3604d5e7d581f Mon Sep 17 00:00:00 2001 From: primiano Date: Wed, 1 Oct 2014 06:46:31 -0700 Subject: [PATCH] Roll breakpad r1387 -> r1388 for breakpad microdumps. This picks up the microdump refactoring and updates the gyp/gn makefiles accordingly. SVN changes picked up by this roll: r1388: Microdumps: refactor out common parts of minidump_writer.cc BUG=410294 Review URL: https://codereview.chromium.org/602403002 Cr-Commit-Position: refs/heads/master@{#297635} --- DEPS | 2 +- breakpad/BUILD.gn | 7 +++++++ breakpad/breakpad.gyp | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/DEPS b/DEPS index fa0233a40662d6..6fed75d399124d 100644 --- a/DEPS +++ b/DEPS @@ -100,7 +100,7 @@ allowed_hosts = [ deps = { 'src/breakpad/src': - Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + '35189355da4b65ed5e7692f790c240a9ab347731', # from svn revision 1387 + Var('chromium_git') + '/external/google-breakpad/src.git' + '@' + 'e15ba2c4d7d3b10c8c2818aa14ab66ad9a383ff6', # from svn revision 1388 'src/buildtools': Var('chromium_git') + '/chromium/buildtools.git' + '@' + Var('buildtools_revision'), diff --git a/breakpad/BUILD.gn b/breakpad/BUILD.gn index e8be01f6f11b2e..56a2acb8f40467 100644 --- a/breakpad/BUILD.gn +++ b/breakpad/BUILD.gn @@ -399,6 +399,13 @@ if (is_linux || is_android) { sources = [ "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", + "src/client/linux/dump_writer_common/ucontext_reader.h", "src/client/linux/handler/exception_handler.cc", "src/client/linux/handler/exception_handler.h", "src/client/linux/handler/minidump_descriptor.cc", diff --git a/breakpad/breakpad.gyp b/breakpad/breakpad.gyp index c70bdd33e8cc8d..834122d319aa2e 100644 --- a/breakpad/breakpad.gyp +++ b/breakpad/breakpad.gyp @@ -463,6 +463,13 @@ 'src/client/linux/handler/minidump_descriptor.h', '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', + 'src/client/linux/dump_writer_common/ucontext_reader.h', 'src/client/linux/minidump_writer/cpu_set.h', 'src/client/linux/minidump_writer/directory_reader.h', 'src/client/linux/minidump_writer/line_reader.h',