diff options
| -rw-r--r-- | README.ANDROID | 2 | ||||
| -rw-r--r-- | src/common/android/include/sys/user.h | 35 |
2 files changed, 5 insertions, 32 deletions
diff --git a/README.ANDROID b/README.ANDROID index f7eacdde..ed734fcc 100644 --- a/README.ANDROID +++ b/README.ANDROID @@ -6,7 +6,7 @@ on Android, and later generate valid stack traces from the minidumps it generates. 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: =============================== diff --git a/src/common/android/include/sys/user.h b/src/common/android/include/sys/user.h index 5f036047..71b3c09a 100644 --- a/src/common/android/include/sys/user.h +++ b/src/common/android/include/sys/user.h @@ -33,43 +33,16 @@ // 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. // 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 user_regs_struct and user_fpsimd_struct structs. +// - aarch64: Add missing <stdint.h> include. // - Other platforms: Just use the Android NDK unchanged. // TODO(primiano): remove these changes after Chromium has stably rolled to // 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 __cplusplus -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 +#include <stdint.h> #endif // __aarch64__ +#include_next <sys/user.h> + #endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H |