commit ff03110e77ec7fe716c5be11783746f59c814e30
author Colin Cross <ccross@android.com> Tue Feb 18 21:44:26 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Feb 18 21:44:26 2014 +0000
tree f382b3e14e44f1e561cecc029a764745cab1db81
parent a31d378bff575b0a1eb4eee7a59c58eb80f0cff4
parent eaa4765b8cc6a6dd5ee0d26dc1b61a1044817f32

am eaa4765b: Merge "speex: disable neon for arm64"

* commit 'eaa4765b8cc6a6dd5ee0d26dc1b61a1044817f32':
  speex: disable neon for arm64

Android.mk

diff --git a/Android.mk b/Android.mk
index ee45b84..0e5c77e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -51,8 +51,12 @@
 LOCAL_CFLAGS += -DEXPORT= -DFIXED_POINT -DRESAMPLE_FORCE_FULL_SINC_TABLE
 LOCAL_CFLAGS += -O3 -fstrict-aliasing -fprefetch-loop-arrays
 
+ifeq ($(TARGET_ARCH),arm64)
+$(warning TODOArm64: enable neon in libspeex)
+endif
+
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
-LOCAL_CFLAGS += -D_USE_NEON
+LOCAL_CFLAGS_arm += -D_USE_NEON
 endif
 
 LOCAL_C_INCLUDES += \