While all our devices were V6 compatible, our simulator doesn't appear to be...
Change-Id: Id594b4cf13c650f57770129f8a708b6eef3cbd4f
diff --git a/Android.mk b/Android.mk
index e6aba14..b5a0afd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -107,7 +107,12 @@
vp8/common/arm/neon/loopfilter_neon.s \
vp8/common/arm/neon/mbloopfilter_neon.s \
-else # other ARMs are assumed to support V6
+else ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
+
+# Really, we only need ARMV6 support but I could not find an environment
+# variable to query that...
+
+LOCAL_CFLAGS += -D__ARM_HAVE_ARMV6
ASM_FILES = \
vp8/common/arm/armv6/bilinearfilter_v6.s \
diff --git a/vpx_config.h b/vpx_config.h
index 3ce2336..598d215 100644
--- a/vpx_config.h
+++ b/vpx_config.h
@@ -12,13 +12,17 @@
#endif
#if defined(__ARM_HAVE_NEON)
-#define HAVE_ARMV6 0
#define HAVE_ARMV7 1
#else
-#define HAVE_ARMV6 1
#define HAVE_ARMV7 0
#endif
+#if defined(__ARM_HAVE_ARMV6)
+#define HAVE_ARMV6 1
+#else
+#define HAVE_ARMV6 0
+#endif
+
#define ARCH_MIPS 0
#define ARCH_X86 0
#define ARCH_X86_64 0
