ref: 8bb82fded57f6316fdfd103d565050d0f1286bc5
parent: 999f31f71c02d0ed560f203c83ff754f78b7da20
author: Johann <johannkoenig@google.com>
date: Mon Nov 19 07:47:27 EST 2012
Upstream build bug for chromium 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. Change-Id: I5c3769f983fcbad1ed602feda781690c6e4e97b3
--- a/vpx_ports/arm_cpudetect.c
+++ b/vpx_ports/arm_cpudetect.c
@@ -125,7 +125,11 @@
}
#elif defined(__ANDROID__) /* end _MSC_VER */
+#if defined(CHROMIUM_BUILD)
+#include <machine/cpu-features.h>
+#else
#include <cpu-features.h>
+#endif
int arm_cpu_caps(void)
{