commit db604cdc155b4fbba389439ea4145fe9920dd2b6
author John Reck <jreck@android.com> Fri May 23 22:40:58 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri May 23 22:40:58 2014 +0000
tree e0d91a166486805affa71e8cb1b92fa073b06776
parent d28dcc059e8650116709d602f581fa6e687f06ad
parent 04f0b19899c66ffeadf74a7b9a6f404aef905b79

am 04f0b198: Merge "Revert "libpng 1.6.10 enable NEON Optimizations""

* commit '04f0b19899c66ffeadf74a7b9a6f404aef905b79':
  Revert "libpng 1.6.10 enable NEON Optimizations"

Android.mk

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