aboutsummaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorDinesh K Garg <dineshg@codeaurora.org>2010-12-28 15:43:58 -0800
committerSteve Kondik <shade@chemlab.org>2012-07-10 12:53:19 -0700
commitfb9d57017268c5cbe74145e3a677b473b14e0e36 (patch)
treef8d046cee468510ebcc4e58fccc0a3535080cbba /Android.mk
parent4c5554b04e73f89d4a9bab8cbcec1943d8c274be (diff)
downloadexternal_libpng-fb9d57017268c5cbe74145e3a677b473b14e0e36.zip
external_libpng-fb9d57017268c5cbe74145e3a677b473b14e0e36.tar.gz
external_libpng-fb9d57017268c5cbe74145e3a677b473b14e0e36.tar.bz2
VeNum optimizations to libpng to improve PNG decode time
Set correct counter in neon routine for SUB filter type. Enable Neon optimizations for all filter types and pixel depths. Change-Id: Ica0d39e828a9e0cba59cbc3632830e4eb3e59607 (cherry picked from commit b912f64bc4bb174fc055cda58e303faaa640b8b1) Conflicts: pngrutil.c
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk19
1 files changed, 19 insertions, 0 deletions
diff --git a/Android.mk b/Android.mk
index 4e92908..e1a5714 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,6 +58,11 @@ include $(BUILD_HOST_STATIC_LIBRARY)
# For the device
# =====================================================
+ifeq ($(ARCH_ARM_HAVE_NEON),true)
+ common_SRC_FILES += contrib/pngneon/png_read_filter_row_neon.s
+ common_CFLAGS += -D__ARM_HAVE_NEON
+endif
+
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(common_SRC_FILES)
@@ -75,3 +80,17 @@ LOCAL_COPY_HEADERS := $(common_COPY_HEADERS)
include $(BUILD_STATIC_LIBRARY)
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(common_SRC_FILES)
+LOCAL_CFLAGS += $(common_CFLAGS)
+LOCAL_C_INCLUDES += $(common_C_INCLUDES) \
+ external/zlib
+LOCAL_SHARED_LIBRARIES := \
+ libz
+
+LOCAL_MODULE:= libpng
+
+LOCAL_PRELINK_MODULE := false
+
+include $(BUILD_SHARED_LIBRARY)