diff options
| author | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-08-20 20:22:05 +0000 |
|---|---|---|
| committer | digit@chromium.org <digit@chromium.org@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2012-08-20 20:22:05 +0000 |
| commit | d270dcfa18acc0b9d65798a1f271f9859552244e (patch) | |
| tree | 746196b2a83ef7507c6c36b8caf4016cab673b4a /android | |
| parent | Getting context information from the kernel when catching a SIGABRT on iOS. (diff) | |
| download | breakpad-d270dcfa18acc0b9d65798a1f271f9859552244e.tar.xz | |
Fix Android build.
This patch fixes the Android build, and updates the NDK test
application to use the new Linux ExceptionHandler API.
+ Use string insted of std::string in minidump_descriptor.h
Review URL: https://breakpad.appspot.com/433002
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@1016 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'android')
| -rw-r--r-- | android/google_breakpad/Android.mk | 1 | ||||
| -rw-r--r-- | android/sample_app/jni/test_breakpad.cpp | 10 |
2 files changed, 7 insertions, 4 deletions
diff --git a/android/google_breakpad/Android.mk b/android/google_breakpad/Android.mk index 00ea737e..f6d0b22a 100644 --- a/android/google_breakpad/Android.mk +++ b/android/google_breakpad/Android.mk @@ -77,6 +77,7 @@ LOCAL_ARM_MODE := arm LOCAL_SRC_FILES := \ src/client/linux/crash_generation/crash_generation_client.cc \ src/client/linux/handler/exception_handler.cc \ + src/client/linux/handler/minidump_descriptor.cc \ src/client/linux/log/log.cc \ src/client/linux/minidump_writer/linux_dumper.cc \ src/client/linux/minidump_writer/linux_ptrace_dumper.cc \ diff --git a/android/sample_app/jni/test_breakpad.cpp b/android/sample_app/jni/test_breakpad.cpp index 6c18edfb..9c4ebbb1 100644 --- a/android/sample_app/jni/test_breakpad.cpp +++ b/android/sample_app/jni/test_breakpad.cpp @@ -30,14 +30,14 @@ #include <stdio.h> #include "client/linux/handler/exception_handler.h" +#include "client/linux/handler/minidump_descriptor.h" namespace { -bool DumpCallback(const char* dump_path, - const char* minidump_id, +bool DumpCallback(const google_breakpad::MinidumpDescriptor& descriptor, void* context, bool succeeded) { - printf("Dump path: %s/%s.dmp\n", dump_path, minidump_id); + printf("Dump path: %s\n", descriptor.path()); return succeeded; } @@ -49,7 +49,9 @@ void Crash() { } // namespace int main(int argc, char* argv[]) { - google_breakpad::ExceptionHandler eh(".", NULL, DumpCallback, NULL, true); + google_breakpad::MinidumpDescriptor descriptor("."); + google_breakpad::ExceptionHandler eh(descriptor, NULL, DumpCallback, + NULL, true, -1); Crash(); return 0; } |