am eaa4765b: Merge "speex: disable neon for arm64"
* commit 'eaa4765b8cc6a6dd5ee0d26dc1b61a1044817f32':
speex: disable neon for arm64
diff --git a/Android.mk b/Android.mk
index b63528e..0e5c77e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -31,7 +31,7 @@
LOCAL_CFLAGS+= -DEXPORT= -DFLOATING_POINT -DUSE_SMALLFT -DVAR_ARRAYS
-LOCAL_CFLAGS+= -O3 -fstrict-aliasing -fprefetch-loop-arrays
+LOCAL_CFLAGS+= -O3 -fstrict-aliasing -fprefetch-loop-arrays
LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/include
@@ -63,3 +63,62 @@
$(LOCAL_PATH)/include
include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_ARM_MODE := arm
+
+LOCAL_SRC_FILES += \
+ libspeex/bits.c \
+ libspeex/cb_search.c \
+ libspeex/exc_10_16_table.c \
+ libspeex/exc_10_32_table.c \
+ libspeex/exc_20_32_table.c \
+ libspeex/exc_5_256_table.c \
+ libspeex/exc_5_64_table.c \
+ libspeex/exc_8_128_table.c \
+ libspeex/fftwrap.c \
+ libspeex/filterbank.c \
+ libspeex/filters.c \
+ libspeex/gain_table.c \
+ libspeex/gain_table_lbr.c \
+ libspeex/hexc_10_32_table.c \
+ libspeex/hexc_table.c \
+ libspeex/high_lsp_tables.c \
+ libspeex/kiss_fft.c \
+ libspeex/kiss_fftr.c \
+ libspeex/lpc.c \
+ libspeex/lsp.c \
+ libspeex/lsp_tables_nb.c \
+ libspeex/ltp.c \
+ libspeex/mdf.c \
+ libspeex/modes.c \
+ libspeex/modes_wb.c \
+ libspeex/nb_celp.c \
+ libspeex/preprocess.c \
+ libspeex/quant_lsp.c \
+ libspeex/sb_celp.c \
+ libspeex/smallft.c \
+ libspeex/speex.c \
+ libspeex/speex_callbacks.c \
+ libspeex/speex_header.c \
+ libspeex/vbr.c \
+ libspeex/vq.c \
+ libspeex/window.c \
+ libspeex/buffer.c \
+ libspeex/resample.c \
+ libspeex/scal.c
+
+LOCAL_MODULE:= libspeex_googletts
+LOCAL_SDK_VERSION := 14
+
+LOCAL_CFLAGS+= -DEXPORT= -DFLOATING_POINT -DUSE_SMALLFT -DVAR_ARRAYS
+LOCAL_CFLAGS+= -O3 -fstrict-aliasing -fprefetch-loop-arrays
+
+LOCAL_C_INCLUDES += \
+ $(LOCAL_PATH)/include
+
+include $(BUILD_STATIC_LIBRARY)
+
+
+
