Commit 5d5c2892 authored by jcivelli@chromium.org's avatar jcivelli@chromium.org

Rolling the DEPS of Breakpad.

Rolling the DEPS of Breakpad in order to get the file descriptor support for
generating minidumps, it is needed on Android.

BUG=None
TEST=Breakpad unit-tests should compile and run.


Review URL: https://chromiumcodereview.appspot.com/10825329

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151612 0039d316-1c4b-4281-b951-d872f2087c98
parent b8d10fdd
...@@ -41,7 +41,7 @@ vars = { ...@@ -41,7 +41,7 @@ vars = {
deps = { deps = {
"src/breakpad/src": "src/breakpad/src":
(Var("googlecode_url") % "google-breakpad") + "/trunk/src@999", (Var("googlecode_url") % "google-breakpad") + "/trunk/src@1008",
"src/googleurl": "src/googleurl":
(Var("googlecode_url") % "google-url") + "/trunk@175", (Var("googlecode_url") % "google-url") + "/trunk@175",
......
...@@ -440,6 +440,8 @@ ...@@ -440,6 +440,8 @@
'src/common/linux/elfutils.h', 'src/common/linux/elfutils.h',
'src/common/linux/file_id.cc', 'src/common/linux/file_id.cc',
'src/common/linux/file_id.h', 'src/common/linux/file_id.h',
'src/common/linux/linux_libc_support.cc',
'src/common/linux/linux_libc_support.h',
'src/common/linux/memory_mapped_file.cc', 'src/common/linux/memory_mapped_file.cc',
'src/common/linux/memory_mapped_file.h', 'src/common/linux/memory_mapped_file.h',
'src/common/linux/guid_creator.h', 'src/common/linux/guid_creator.h',
...@@ -476,6 +478,9 @@ ...@@ -476,6 +478,9 @@
'src/client/linux/crash_generation/crash_generation_client.cc', 'src/client/linux/crash_generation/crash_generation_client.cc',
'src/client/linux/crash_generation/crash_generation_client.h', 'src/client/linux/crash_generation/crash_generation_client.h',
'src/client/linux/handler/exception_handler.cc', 'src/client/linux/handler/exception_handler.cc',
'src/client/linux/handler/exception_handler.h',
'src/client/linux/handler/minidump_descriptor.cc',
'src/client/linux/handler/minidump_descriptor.h',
'src/client/linux/log/log.cc', 'src/client/linux/log/log.cc',
'src/client/linux/log/log.h', 'src/client/linux/log/log.h',
'src/client/linux/minidump_writer/directory_reader.h', 'src/client/linux/minidump_writer/directory_reader.h',
...@@ -505,6 +510,7 @@ ...@@ -505,6 +510,7 @@
'src/common/linux/guid_creator.h', 'src/common/linux/guid_creator.h',
'src/common/linux/libcurl_wrapper.cc', 'src/common/linux/libcurl_wrapper.cc',
'src/common/linux/libcurl_wrapper.h', 'src/common/linux/libcurl_wrapper.h',
'src/common/linux/linux_libc_support.cc',
'src/common/linux/linux_libc_support.h', 'src/common/linux/linux_libc_support.h',
'src/common/linux/memory_mapped_file.cc', 'src/common/linux/memory_mapped_file.cc',
'src/common/linux/memory_mapped_file.h', 'src/common/linux/memory_mapped_file.h',
...@@ -586,7 +592,6 @@ ...@@ -586,7 +592,6 @@
'src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc', 'src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc',
'src/client/linux/minidump_writer/minidump_writer_unittest.cc', 'src/client/linux/minidump_writer/minidump_writer_unittest.cc',
'src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc', 'src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc',
'src/client/linux/minidump_writer/minidump_writer_unittest_utils.h',
'src/common/linux/elf_core_dump_unittest.cc', 'src/common/linux/elf_core_dump_unittest.cc',
'src/common/linux/file_id_unittest.cc', 'src/common/linux/file_id_unittest.cc',
'src/common/linux/linux_libc_support_unittest.cc', 'src/common/linux/linux_libc_support_unittest.cc',
......
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
#include "breakpad/src/common/linux/linux_libc_support.h" #include "breakpad/src/common/linux/linux_libc_support.h"
#include "third_party/lss/linux_syscall_support.h" #include "third_party/lss/linux_syscall_support.h"
static bool DumpCallback(const char* dump_path, const char* minidump_id, static bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor,
void* context, bool success) { void* context, bool success) {
if (!success) { if (!success) {
static const char msg[] = "Failed to write minidump\n"; static const char msg[] = "Failed to write minidump\n";
...@@ -47,10 +47,8 @@ static bool DumpCallback(const char* dump_path, const char* minidump_id, ...@@ -47,10 +47,8 @@ static bool DumpCallback(const char* dump_path, const char* minidump_id,
static const char msg[] = "Wrote minidump: "; static const char msg[] = "Wrote minidump: ";
sys_write(2, msg, sizeof(msg) - 1); sys_write(2, msg, sizeof(msg) - 1);
sys_write(2, dump_path, my_strlen(dump_path)); sys_write(2, descriptor.path(), strlen(descriptor.path()));
sys_write(2, "/", 1); sys_write(2, "\n", 1);
sys_write(2, minidump_id, my_strlen(minidump_id));
sys_write(2, ".dmp\n", 5);
return true; return true;
} }
...@@ -61,8 +59,9 @@ static void DoSomethingWhichCrashes() { ...@@ -61,8 +59,9 @@ static void DoSomethingWhichCrashes() {
} }
int main() { int main() {
google_breakpad::ExceptionHandler breakpad(".", NULL, DumpCallback, NULL, google_breakpad::MinidumpDescriptor minidump(".");
true); google_breakpad::ExceptionHandler breakpad(minidump, NULL, DumpCallback, NULL,
true, -1);
DoSomethingWhichCrashes(); DoSomethingWhichCrashes();
return 0; return 0;
} }
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment