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)