[Android] Update breakpad to NDK r11c.

BUG=599327
R=mark@chromium.org, primiano@chromium.org

Review URL: https://codereview.chromium.org/2025923003 .
This commit is contained in:
Primiano Tucci 2016-06-02 17:07:07 +01:00
parent bad9e55ea5
commit d269bd0f29
2 changed files with 5 additions and 32 deletions

View file

@ -6,7 +6,7 @@ on Android, and later generate valid stack traces from the minidumps
it generates. it generates.
This release supports ARM, x86 and MIPS based Android systems. This release supports ARM, x86 and MIPS based Android systems.
This release requires NDK release r10c or higher. This release requires NDK release r11c or higher.
I. Building the client library: I. Building the client library:
=============================== ===============================

View file

@ -33,43 +33,16 @@
// The purpose of this file is to glue the mismatching headers (Android NDK vs // The purpose of this file is to glue the mismatching headers (Android NDK vs
// glibc) and therefore avoid doing otherwise awkward #ifdefs in the code. // glibc) and therefore avoid doing otherwise awkward #ifdefs in the code.
// The following quirks are currently handled by this file: // The following quirks are currently handled by this file:
// - i386: Use the Android NDK but alias user_fxsr_struct > user_fpxregs_struct. // - aarch64: Add missing <stdint.h> include.
// - aarch64: Add missing user_regs_struct and user_fpsimd_struct structs.
// - Other platforms: Just use the Android NDK unchanged. // - Other platforms: Just use the Android NDK unchanged.
// TODO(primiano): remove these changes after Chromium has stably rolled to // TODO(primiano): remove these changes after Chromium has stably rolled to
// an NDK with the appropriate fixes. // an NDK with the appropriate fixes.
#include_next <sys/user.h>
#ifdef __i386__
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
typedef struct user_fxsr_struct user_fpxregs_struct;
#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
#endif // __i386__
#ifdef __aarch64__ #ifdef __aarch64__
#ifdef __cplusplus #include <stdint.h>
extern "C" {
#endif // __cplusplus
struct user_regs_struct {
__u64 regs[31];
__u64 sp;
__u64 pc;
__u64 pstate;
};
struct user_fpsimd_struct {
__uint128_t vregs[32];
__u32 fpsr;
__u32 fpcr;
};
#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
#endif // __aarch64__ #endif // __aarch64__
#include_next <sys/user.h>
#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H #endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H