android: Fix FloatContext::NativeFpxregs for x86 with unified headers

user_fxsr_struct is only used in traditional NDK headers. Unified
headers always use user_fpxregs_struct regardless of API level.

Bug: crashpad:30, b/63025548
Change-Id: Id9d350801e659673b136e6fb8c0cbbbeb6055c4b
Reviewed-on: https://chromium-review.googlesource.com/549376
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
Mark Mentovai 2017-06-26 18:09:35 -04:00
parent f37b382687
commit a8493c9b31

View File

@ -220,7 +220,10 @@ union FloatContext {
} f64;
#if defined(ARCH_CPU_X86)
#if defined(OS_ANDROID) && __ANDROID_API__ <= 19
// __ANDROID_API_N__ is a proxy for determining whether unified headers are in
// use. Its only defined by unified headers. Unified headers call this
// structure user_fpxregs_struct regardless of API level.
#if defined(OS_ANDROID) && __ANDROID_API__ <= 19 && !defined(__ANDROID_API_N__)
using NativeFpxregs = user_fxsr_struct;
#else
using NativeFpxregs = user_fpxregs_struct;