diff options
| author | Andreas Huber <andih@google.com> | 2011-04-07 09:50:43 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2011-04-07 09:50:43 -0700 |
| commit | 0c59242dc539a9a9f0293dfa5e2b23a75f2b9fc5 (patch) | |
| tree | 191739d8c1bdaf9882fa5f634e591443b186731b | |
| parent | f8070e5af95989e60087d53322960db55374c95a (diff) | |
| download | libvpx-0c59242dc539a9a9f0293dfa5e2b23a75f2b9fc5.tar.gz | |
While all our devices were V6 compatible, our simulator doesn't appear to be...
Change-Id: Id594b4cf13c650f57770129f8a708b6eef3cbd4f
| -rw-r--r-- | Android.mk | 7 | ||||
| -rw-r--r-- | vpx_config.h | 8 |
2 files changed, 12 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index e6aba14b8..b5a0afd16 100644 --- a/Android.mk +++ b/Android.mk @@ -107,7 +107,12 @@ ASM_FILES = \ 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 3ce23362b..598d21568 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 |