commit b43974131d78bade0d174820aba22a97d986086a
author Riley Andrews <riandrews@google.com> Tue Aug 19 17:21:02 2014 -0700
committer Narayan Kamath <narayan@google.com> Tue Oct 14 13:23:06 2014 +0100
tree 9e9d85fb9270064b7dc84c9a931e1c0cb9f04dfa
parent 48b7ba25a15a9eae83d366c02475539725d035d0

Turn on neon instrinsics for arm64 by turning off runtime detection.

+ Also turn off runtime detection for arm32 when we know
the build supports neon.

(cherry picked from commit 7f21a7f1c312334ba3548100d6fbdb5679127026)

Change-Id: Ia1926107bd8e87ebc0ef653ed671808cf9b7451f

Android.mk

diff --git a/Android.mk b/Android.mk
index 9e7c712..86e63e1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,10 +21,10 @@
 	pngwutil.c \
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
-my_cflags_arm := -DPNG_ARM_NEON_OPT=2 -DPNG_ARM_NEON_CHECK_SUPPORTED
+my_cflags_arm := -DPNG_ARM_NEON_OPT=2
 endif
 
-my_cflags_arm64 := -DPNG_ARM_NEON_OPT=2 -DPNG_ARM_NEON_CHECK_SUPPORTED
+my_cflags_arm64 := -DPNG_ARM_NEON_OPT=2
 
 # BUG: http://llvm.org/PR19472 - SLP vectorization (on ARM at least) crashes
 # when we can't lower a vectorized bswap.