https://codereview.chromium.org/11413061/ The Android NDK automatically manages the include directories. Trying to do so manually for the Android GYP files can cause the wrong setjmp.h to be included.
Unified · Split
| @@ -125,7 +125,11 @@ int arm_cpu_caps(void) · 124 unmodified lines | ||
| 125 | 125 | } |
| 126 | 126 | |
| 127 | 127 | #elif defined(__ANDROID__) /* end _MSC_VER */ |
| 128 | +#if defined(CHROMIUM_BUILD) | |
| 129 | +#include <machine/cpu-features.h> | |
| 130 | +#else | |
| 128 | 131 | #include <cpu-features.h> |
| 132 | +#endif | |
| 129 | 133 | |
| 130 | 134 | int arm_cpu_caps(void) |
| 131 | 135 | { |