commit d28dcc059e8650116709d602f581fa6e687f06ad
author John Reck <jreck@android.com> Fri May 23 19:44:03 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 23 19:44:03 2014 +0000
tree 4167ebdff2d77dd8c3b07d4b5c5eb1a54237ac6b
parent 3433e876ce57a723649d9d84635aa23394753bac
parent 9566386ae8c57012fa4101b49826894706c7cffb

am 9566386a: Merge "libpng 1.6.10 enable NEON Optimizations"

* commit '9566386ae8c57012fa4101b49826894706c7cffb':
  libpng 1.6.10 enable NEON Optimizations

Android.mk

diff --git a/Android.mk b/Android.mk
index 2551612..f545581 100644
--- a/Android.mk
+++ b/Android.mk
@@ -20,10 +20,7 @@
 	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 :=
+my_cflags_arm := -DPNG_ARM_NEON_OPT=2 -DPNG_ARM_NEON_CHECK_SUPPORTED
 
 # BUG: http://llvm.org/PR19472 - SLP vectorization (on ARM at least) crashes
 # when we can't lower a vectorized bswap.