libpng - enable neon support
Neon support failed on aosp_arm-eng because that
build didn't have NEON support but yet NEON flags
were applied unconditionally.
This change conditions NEON flags on ARCH_ARM_HAVE_NEON.
Change-Id: Id8dbf98e6f2bdd85857ac0836fde1b4c6ff37cc5
diff --git a/Android.mk b/Android.mk
index 2551612..41f89c9 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,10 +20,9 @@
pngwtran.c \
pngwutil.c \
-# Previously these arm-specific flags were never applied.
-# TODO: apply the flags and fix the build.
-# my_cflags_arm := -DPNG_ARM_NEON_OPT=2 -DPNG_ARM_NEON_CHECK_SUPPORTED
-my_cflags_arm :=
+ifeq ($(ARCH_ARM_HAVE_NEON),true)
+my_cflags_arm := -DPNG_ARM_NEON_OPT=2 -DPNG_ARM_NEON_CHECK_SUPPORTED
+endif
# BUG: http://llvm.org/PR19472 - SLP vectorization (on ARM at least) crashes
# when we can't lower a vectorized bswap.