Skip to content

Commit

Permalink
Rolling the DEPS of Breakpad.
Browse files Browse the repository at this point in the history
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
  • Loading branch information
jcivelli@chromium.org committed Aug 15, 2012
1 parent b8d10fd commit 5d5c289
Show file tree
Hide file tree
Showing 4 changed files with 221 additions and 220 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ vars = {

deps = {
"src/breakpad/src":
(Var("googlecode_url") % "google-breakpad") + "/trunk/src@999",
(Var("googlecode_url") % "google-breakpad") + "/trunk/src@1008",

"src/googleurl":
(Var("googlecode_url") % "google-url") + "/trunk@175",
Expand Down
7 changes: 6 additions & 1 deletion breakpad/breakpad.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,8 @@
'src/common/linux/elfutils.h',
'src/common/linux/file_id.cc',
'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.h',
'src/common/linux/guid_creator.h',
Expand Down Expand Up @@ -476,6 +478,9 @@
'src/client/linux/crash_generation/crash_generation_client.cc',
'src/client/linux/crash_generation/crash_generation_client.h',
'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.h',
'src/client/linux/minidump_writer/directory_reader.h',
Expand Down Expand Up @@ -505,6 +510,7 @@
'src/common/linux/guid_creator.h',
'src/common/linux/libcurl_wrapper.cc',
'src/common/linux/libcurl_wrapper.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.h',
Expand Down Expand Up @@ -586,7 +592,6 @@
'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_utils.cc',
'src/client/linux/minidump_writer/minidump_writer_unittest_utils.h',
'src/common/linux/elf_core_dump_unittest.cc',
'src/common/linux/file_id_unittest.cc',
'src/common/linux/linux_libc_support_unittest.cc',
Expand Down
13 changes: 6 additions & 7 deletions breakpad/linux/generate-test-dump.cc
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
#include "breakpad/src/common/linux/linux_libc_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) {
if (!success) {
static const char msg[] = "Failed to write minidump\n";
Expand All @@ -47,10 +47,8 @@ static bool DumpCallback(const char* dump_path, const char* minidump_id,

static const char msg[] = "Wrote minidump: ";
sys_write(2, msg, sizeof(msg) - 1);
sys_write(2, dump_path, my_strlen(dump_path));
sys_write(2, "/", 1);
sys_write(2, minidump_id, my_strlen(minidump_id));
sys_write(2, ".dmp\n", 5);
sys_write(2, descriptor.path(), strlen(descriptor.path()));
sys_write(2, "\n", 1);

return true;
}
Expand All @@ -61,8 +59,9 @@ static void DoSomethingWhichCrashes() {
}

int main() {
google_breakpad::ExceptionHandler breakpad(".", NULL, DumpCallback, NULL,
true);
google_breakpad::MinidumpDescriptor minidump(".");
google_breakpad::ExceptionHandler breakpad(minidump, NULL, DumpCallback, NULL,
true, -1);
DoSomethingWhichCrashes();
return 0;
}
Loading

0 comments on commit 5d5c289

Please sign in to comment.