From 7a09f6b8926835fc7a8fb59cdf632b2703a640b5 Mon Sep 17 00:00:00 2001
From: Johann <johannkoenig@google.com>
Date: Tue, 11 Dec 2012 11:47:49 -0800
Subject: [PATCH] Revert "Upstream build bug for chromium"
This reverts commit 8bb82fded57f6316fdfd103d565050d0f1286bc5.
This is an incorrect workaround. It has been fixed in the GYP files
upstream.
Change-Id: If42f997747ce878b874508fdf7ae5a73a6fa1b2b
---
vpx_ports/arm_cpudetect.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/vpx_ports/arm_cpudetect.c b/vpx_ports/arm_cpudetect.c
index 74d8a1fa81..8ff95a110b 100644
--- a/vpx_ports/arm_cpudetect.c
+++ b/vpx_ports/arm_cpudetect.c
@@ -125,11 +125,7 @@ int arm_cpu_caps(void)
}
#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)
{
--
GitLab