diff options
| author | Elliott Hughes <enh@google.com> | 2014-12-03 17:20:46 -0800 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2014-12-03 17:28:58 -0800 |
| commit | 4660f767bca6ddae968d4f5fcfa2fd5ab80c4692 (patch) | |
| tree | 94c27e4b5c4fe20378267bba3155953da88c2294 /Android.mk | |
| parent | 57cc16e38e6461da4317c285eec61c3265e516bf (diff) | |
| download | android_external_jpeg-4660f767bca6ddae968d4f5fcfa2fd5ab80c4692.tar.gz android_external_jpeg-4660f767bca6ddae968d4f5fcfa2fd5ab80c4692.tar.bz2 android_external_jpeg-4660f767bca6ddae968d4f5fcfa2fd5ab80c4692.zip | |
libjpeg should #define __ARM_HAVE_NEON.
Bug: 18556103
Change-Id: Ifcedc68c4625b07a1bb494085842003f35bacdd4
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -11,7 +11,9 @@ LOCAL_SRC_FILES := \ jdinput.c jdmainct.c jdmarker.c jdmaster.c jdmerge.c jdphuff.c \ jdpostct.c jdsample.c jdtrans.c jerror.c jfdctflt.c jfdctfst.c \ jfdctint.c jidctflt.c jidctfst.c jidctint.c jidctred.c jquant1.c \ - jquant2.c jutils.c jmemmgr.c armv6_idct.S + jquant2.c jutils.c jmemmgr.c + +LOCAL_SRC_FILES_arm += armv6_idct.S # jsimd_arm_neon.S does not compile with clang. LOCAL_CLANG_ASFLAGS_arm += -no-integrated-as @@ -46,7 +48,7 @@ endif ifeq ($(strip $(TARGET_ARCH)),arm) ifeq ($(ARCH_ARM_HAVE_NEON),true) #use NEON accelerations - LOCAL_CFLAGS += -DNV_ARM_NEON + LOCAL_CFLAGS += -DNV_ARM_NEON -D__ARM_HAVE_NEON LOCAL_SRC_FILES += \ jsimd_arm_neon.S \ jsimd_neon.c |