yuzu-emu/breakpad
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[Android] Guard some NDK workarounds by major version.

Browse source 
BUG=599327
R=mark@chromium.org

Review URL: https://codereview.chromium.org/2152153003 .
This commit is contained in:
John Budorick 2016-07-15 12:49:44 -07:00
parent dfd2da7979
commit 965424f183
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/common/android/include/sys/user.h
View file

@ -34,12 +34,20 @@
// 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. // - 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:
// - 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. // - 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.
#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
#include_next <sys/user.h> #include_next <sys/user.h>
#ifdef __i386__ #ifdef __i386__
@ -52,6 +60,7 @@ typedef struct user_fxsr_struct user_fpxregs_struct;
#endif // __cplusplus #endif // __cplusplus
#endif // __i386__ #endif // __i386__
#if !defined(ANDROID_NDK_MAJOR_VERSION) || ANDROID_NDK_MAJOR_VERSION == 10
#ifdef __aarch64__ #ifdef __aarch64__
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
@ -71,5 +80,6 @@ struct user_fpsimd_struct {
} // extern "C" } // extern "C"
#endif // __cplusplus #endif // __cplusplus
#endif // __aarch64__ #endif // __aarch64__
#endif // defined(ANDROID_NDK_VERSION) && ANDROID_NDK_MAJOR_VERSION == 10
#endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H #endif // GOOGLE_BREAKPAD_COMMON_ANDROID_INCLUDE_SYS_USER_H