From 4660f767bca6ddae968d4f5fcfa2fd5ab80c4692 Mon Sep 17 00:00:00 2001
From: Elliott Hughes <enh@google.com>
Date: Wed, 3 Dec 2014 17:20:46 -0800
Subject: libjpeg should #define __ARM_HAVE_NEON.

Bug: 18556103
Change-Id: Ifcedc68c4625b07a1bb494085842003f35bacdd4
---
 Android.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'Android.mk')

diff --git a/Android.mk b/Android.mk
index a53d907..db87e77 100644
--- a/Android.mk
+++ b/Android.mk
@@ -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
-- 
cgit v1.2.3