diff options
| author | Colin Cross <ccross@android.com> | 2014-02-18 21:44:26 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-18 21:44:26 +0000 |
| commit | ff03110e77ec7fe716c5be11783746f59c814e30 (patch) | |
| tree | f382b3e14e44f1e561cecc029a764745cab1db81 | |
| parent | a31d378bff575b0a1eb4eee7a59c58eb80f0cff4 (diff) | |
| parent | eaa4765b8cc6a6dd5ee0d26dc1b61a1044817f32 (diff) | |
| download | android_external_speex-ff03110e77ec7fe716c5be11783746f59c814e30.tar.gz android_external_speex-ff03110e77ec7fe716c5be11783746f59c814e30.tar.bz2 android_external_speex-ff03110e77ec7fe716c5be11783746f59c814e30.zip | |
am eaa4765b: Merge "speex: disable neon for arm64"staging/cm-12.1staging/cm-12.0-cafstable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Estable/cm-12.1-YOG7Dstable/cm-12.1-YOG4Pstable/cm-12.1-YOG3Cstable/cm-12.0-YNG4Nstable/cm-12.0-YNG3Cstable/cm-12.0-YNG1TAstable/cm-12.0-YNG1Tstable/cm-12.0-YNG1Icm-12.1cm-12.0
* commit 'eaa4765b8cc6a6dd5ee0d26dc1b61a1044817f32':
speex: disable neon for arm64
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -51,8 +51,12 @@ LOCAL_MODULE_TAGS := optional 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 += \ |