diff options
| author | ted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-10-20 15:51:38 +0000 |
|---|---|---|
| committer | ted.mielczarek <ted.mielczarek@4c0a9323-5329-0410-9bdc-e9ce6186880e> | 2010-10-20 15:51:38 +0000 |
| commit | cfc8628092e17069d8d6c7068d4f21d9baabe077 (patch) | |
| tree | 43e9d016602ec4944511a3f02981a004a6225ef5 /src/client/linux/minidump_writer/linux_dumper.cc | |
| parent | Double stack scanning length in stackwalker (diff) | |
| download | breakpad-cfc8628092e17069d8d6c7068d4f21d9baabe077.tar.xz | |
Add support for building the Linux client code using the Android NDK
r=mwu at http://breakpad.appspot.com/212001/show
git-svn-id: http://google-breakpad.googlecode.com/svn/trunk@716 4c0a9323-5329-0410-9bdc-e9ce6186880e
Diffstat (limited to 'src/client/linux/minidump_writer/linux_dumper.cc')
| -rw-r--r-- | src/client/linux/minidump_writer/linux_dumper.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/client/linux/minidump_writer/linux_dumper.cc b/src/client/linux/minidump_writer/linux_dumper.cc index b7ee1c4d..11b6a18b 100644 --- a/src/client/linux/minidump_writer/linux_dumper.cc +++ b/src/client/linux/minidump_writer/linux_dumper.cc @@ -45,7 +45,9 @@ #include <elf.h> #include <errno.h> #include <fcntl.h> +#if !defined(__ANDROID__) #include <link.h> +#endif #include <sys/types.h> #include <sys/ptrace.h> @@ -388,11 +390,16 @@ bool LinuxDumper::ThreadInfoGet(pid_t tid, ThreadInfo* info) { if (info->ppid == -1 || info->tgid == -1) return false; - if (sys_ptrace(PTRACE_GETREGS, tid, NULL, &info->regs) == -1 || - sys_ptrace(PTRACE_GETFPREGS, tid, NULL, &info->fpregs) == -1) { + if (sys_ptrace(PTRACE_GETREGS, tid, NULL, &info->regs) == -1) { return false; } +#if !defined(__ANDROID__) + if (sys_ptrace(PTRACE_GETFPREGS, tid, NULL, &info->fpregs) == -1) { + return false; + } +#endif + #if defined(__i386) if (sys_ptrace(PTRACE_GETFPXREGS, tid, NULL, &info->fpxregs) == -1) return false; @@ -417,7 +424,7 @@ bool LinuxDumper::ThreadInfoGet(pid_t tid, ThreadInfo* info) { #elif defined(__x86_64) memcpy(&stack_pointer, &info->regs.rsp, sizeof(info->regs.rsp)); #elif defined(__ARM_EABI__) - memcpy(&stack_pointer, &info->regs.uregs[R13], sizeof(info->regs.uregs[R13])); + memcpy(&stack_pointer, &info->regs.ARM_sp, sizeof(info->regs.ARM_sp)); #else #error "This code hasn't been ported to your platform yet." #endif |