aboutsummaryrefslogtreecommitdiff
path: root/src/common/android
diff options
context:
space:
mode:
authorPrimiano Tucci <primiano@chromium.org>2016-06-02 17:07:07 +0100
committerPrimiano Tucci <primiano@chromium.org>2016-06-02 17:07:07 +0100
commitd269bd0f29124ad0c2c6d45cf95045c23ba61038 (patch)
tree3aa9cfa9b34f9ff04f63c118c605bd2dc97e99ac /src/common/android
parentfix signed warning errors in unittests (diff)
downloadbreakpad-d269bd0f29124ad0c2c6d45cf95045c23ba61038.tar.xz
[Android] Update breakpad to NDK r11c.
BUG=599327 R=mark@chromium.org, primiano@chromium.org Review URL: https://codereview.chromium.org/2025923003 .
Diffstat (limited to 'src/common/android')
-rw-r--r--src/common/android/include/sys/user.h35
1 files changed, 4 insertions, 31 deletions
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