commit c281012d16f4dcb45adcd39d79802e95bc0f9a3a
author John Reck <jreck@android.com> Tue Jun 24 19:42:40 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 24 19:42:40 2014 +0000
tree 56e7f232d16348453314813e50e053233ef7bba6
parent db604cdc155b4fbba389439ea4145fe9920dd2b6
parent 028c6d76803bbe487a57e9dee80c3f55d8073260

am 028c6d76: Merge "libpng - enable neon support"

* commit '028c6d76803bbe487a57e9dee80c3f55d8073260':
  libpng - enable neon support

Android.mk

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.