Bug 1428182 - 6a. Apply Breakpad upstream commit for building with NDK r16; r=ted
Apply commit afa9c52715db1e4bfaa4b01c9aec40cc249b689b from the Breakpad
upstream to support building with NDK r16.
MozReview-Commit-ID: D6xafYkjhjt
--- a/toolkit/crashreporter/google-breakpad/src/common/android/include/link.h
+++ b/toolkit/crashreporter/google-breakpad/src/common/android/include/link.h
@@ -29,20 +29,26 @@
#ifndef GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H
#define GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H
/* Android doesn't provide all the data-structures required in its <link.h>.
Provide custom version here. */
#include_next <link.h>
-// TODO(rmcilroy): Remove this file once the ndk is updated for other
-// architectures - crbug.com/358831
-#if !defined(__aarch64__) && !defined(__x86_64__) && \
- !(defined(__mips__) && _MIPS_SIM == _ABI64)
+#include <android/api-level.h>
+
+// TODO(rmcilroy): Remove this file once the NDK API level is updated to at
+// least 21 for all architectures. https://crbug.com/358831
+
+// These structures are only present in traditional headers at API level 21 and
+// above. Unified headers define these structures regardless of the chosen API
+// level. __ANDROID_API_N__ is a proxy for determining whether unified headers
+// are in use. It’s only defined by unified headers.
+#if __ANDROID_API__ < 21 && !defined(__ANDROID_API_N__)
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
#if defined(ANDROID) && ANDROID_VERSION <= 20
struct r_debug {
int r_version;
@@ -63,11 +69,11 @@ struct link_map {
struct link_map* l_prev;
};
#endif
#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
-#endif // !defined(__aarch64__) && !defined(__x86_64__)
+#endif // __ANDROID_API__ < 21 && !defined(__ANDROID_API_N__)
#endif /* GOOGLE_BREAKPAD_ANDROID_INCLUDE_LINK_H */
--- a/toolkit/crashreporter/google-breakpad/src/common/android/include/sys/user.h
+++ b/toolkit/crashreporter/google-breakpad/src/common/android/include/sys/user.h
@@ -29,57 +29,37 @@
#ifndef GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H
#define GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H
// 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:
-// - NDK r10: Add missing user_regs_struct and user_fpsimd_struct structs.
-// - NDK r11+: 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.
-
-#if defined(ANDROID_NDK_MAJOR_VERSION) && ANDROID_NDK_MAJOR_VERSION > 10
-#ifdef __aarch64__
-#include <stdint.h>
-#endif // __aarch64__
-#endif // defined(ANDROID_NDK_MAJOR_VERSION) && ANDROID_NDK_MAJOR_VERSION > 10
+// an NDK with the appropriate fixes. https://crbug.com/358831
#include_next <sys/user.h>
-#ifdef __i386__
+#include <android/api-level.h>
+
#ifdef __cplusplus
extern "C" {
#endif // __cplusplus
+
+#if defined(__i386__)
+#if __ANDROID_API__ < 21 && !defined(__ANDROID_API_N__)
+
+// user_fpxregs_struct was called user_fxsr_struct in traditional headers before
+// API level 21. Unified headers call it user_fpxregs_struct regardless of the
+// chosen API level. __ANDROID_API_N__ is a proxy for determining whether
+// unified headers are in use. It’s only defined by unified headers.
typedef struct user_fxsr_struct user_fpxregs_struct;
+
+#endif // __ANDROID_API__ < 21 && !defined(__ANDROID_API_N__)
+#endif // defined(__i386__)
+
#ifdef __cplusplus
} // extern "C"
#endif // __cplusplus
-#endif // __i386__
-
-#if !defined(ANDROID_NDK_MAJOR_VERSION) || ANDROID_NDK_MAJOR_VERSION == 10
-#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
-#endif // __aarch64__
-#endif // defined(ANDROID_NDK_VERSION) && ANDROID_NDK_MAJOR_VERSION == 10
#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H