1diff -ruN libpng-1.6.37.orig/Android.mk libpng-1.6.37/Android.mk
2--- libpng-1.6.37.orig/Android.mk	1969-12-31 16:00:00.000000000 -0800
3+++ libpng-1.6.37/Android.mk	2019-06-19 07:44:06.000000000 -0700
4@@ -0,0 +1,41 @@
5+LOCAL_PATH:= $(call my-dir)
6+
7+include $(CLEAR_VARS)
8+
9+common_SRC_FILES := \
10+    png.c pngerror.c \
11+	pngget.c pngmem.c pngpread.c pngread.c pngrio.c pngrtran.c pngrutil.c \
12+	pngset.c pngtrans.c pngwio.c pngwrite.c pngwtran.c pngwutil.c
13+
14+ifeq ($(TARGET_ARCH_ABI),armeabi)
15+common_SRC_FILES += \
16+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
17+endif
18+ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
19+common_SRC_FILES += \
20+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
21+endif
22+ifeq ($(TARGET_ARCH_ABI),arm64-v8a)
23+common_SRC_FILES += \
24+	arm/arm_init.c arm/filter_neon.S arm/filter_neon_intrinsics.c arm/palette_neon_intrinsics.c
25+endif
26+
27+common_CFLAGS := ## -fomit-frame-pointer
28+
29+common_C_INCLUDES += \
30+
31+# For the host
32+# =====================================================
33+
34+LOCAL_SRC_FILES := $(common_SRC_FILES)
35+LOCAL_CFLAGS += $(common_CFLAGS)
36+LOCAL_C_INCLUDES += $(common_C_INCLUDES)
37+
38+LOCAL_MODULE:= png
39+
40+LOCAL_COPY_HEADERS_TO := $(common_COPY_HEADERS_TO)
41+LOCAL_COPY_HEADERS := $(common_COPY_HEADERS)
42+
43+include $(BUILD_STATIC_LIBRARY)
44+#include $(BUILD_SHARED_LIBRARY)
45+
46diff -ruN libpng-1.6.37.orig/pnglibconf.h libpng-1.6.37/pnglibconf.h
47--- libpng-1.6.37.orig/pnglibconf.h	1969-12-31 16:00:00.000000000 -0800
48+++ libpng-1.6.37/pnglibconf.h	2019-06-19 07:45:35.000000000 -0700
49@@ -0,0 +1,219 @@
50+/* pnglibconf.h - library build configuration */
51+
52+/* libpng version 1.6.37 */
53+
54+/* Copyright (c) 2018-2019 Cosmin Truta */
55+/* Copyright (c) 1998-2002,2004,2006-2018 Glenn Randers-Pehrson */
56+
57+/* This code is released under the libpng license. */
58+/* For conditions of distribution and use, see the disclaimer */
59+/* and license in png.h */
60+
61+/* pnglibconf.h */
62+/* Machine generated file: DO NOT EDIT */
63+/* Derived from: scripts/pnglibconf.dfa */
64+#ifndef PNGLCONF_H
65+#define PNGLCONF_H
66+/* options */
67+#define PNG_16BIT_SUPPORTED
68+#define PNG_ALIGNED_MEMORY_SUPPORTED
69+/*#undef PNG_ARM_NEON_API_SUPPORTED*/
70+/*#undef PNG_ARM_NEON_CHECK_SUPPORTED*/
71+/*#undef PNG_POWERPC_VSX_API_SUPPORTED*/
72+/*#undef PNG_POWERPC_VSX_CHECK_SUPPORTED*/
73+#define PNG_BENIGN_ERRORS_SUPPORTED
74+#define PNG_BENIGN_READ_ERRORS_SUPPORTED
75+/*#undef PNG_BENIGN_WRITE_ERRORS_SUPPORTED*/
76+#define PNG_BUILD_GRAYSCALE_PALETTE_SUPPORTED
77+#define PNG_CHECK_FOR_INVALID_INDEX_SUPPORTED
78+#define PNG_COLORSPACE_SUPPORTED
79+#define PNG_CONSOLE_IO_SUPPORTED
80+#define PNG_CONVERT_tIME_SUPPORTED
81+#define PNG_EASY_ACCESS_SUPPORTED
82+/*#undef PNG_ERROR_NUMBERS_SUPPORTED*/
83+#define PNG_ERROR_TEXT_SUPPORTED
84+#define PNG_FIXED_POINT_SUPPORTED
85+#define PNG_FLOATING_ARITHMETIC_SUPPORTED
86+#define PNG_FLOATING_POINT_SUPPORTED
87+#define PNG_FORMAT_AFIRST_SUPPORTED
88+#define PNG_FORMAT_BGR_SUPPORTED
89+#define PNG_GAMMA_SUPPORTED
90+#define PNG_GET_PALETTE_MAX_SUPPORTED
91+#define PNG_HANDLE_AS_UNKNOWN_SUPPORTED
92+#define PNG_INCH_CONVERSIONS_SUPPORTED
93+#define PNG_INFO_IMAGE_SUPPORTED
94+#define PNG_IO_STATE_SUPPORTED
95+#define PNG_MNG_FEATURES_SUPPORTED
96+#define PNG_POINTER_INDEXING_SUPPORTED
97+#define PNG_PROGRESSIVE_READ_SUPPORTED
98+#define PNG_READ_16BIT_SUPPORTED
99+#define PNG_READ_ALPHA_MODE_SUPPORTED
100+#define PNG_READ_ANCILLARY_CHUNKS_SUPPORTED
101+#define PNG_READ_BACKGROUND_SUPPORTED
102+#define PNG_READ_BGR_SUPPORTED
103+#define PNG_READ_CHECK_FOR_INVALID_INDEX_SUPPORTED
104+#define PNG_READ_COMPOSITE_NODIV_SUPPORTED
105+#define PNG_READ_COMPRESSED_TEXT_SUPPORTED
106+#define PNG_READ_EXPAND_16_SUPPORTED
107+#define PNG_READ_EXPAND_SUPPORTED
108+#define PNG_READ_FILLER_SUPPORTED
109+#define PNG_READ_GAMMA_SUPPORTED
110+#define PNG_READ_GET_PALETTE_MAX_SUPPORTED
111+#define PNG_READ_GRAY_TO_RGB_SUPPORTED
112+#define PNG_READ_INTERLACING_SUPPORTED
113+#define PNG_READ_INT_FUNCTIONS_SUPPORTED
114+#define PNG_READ_INVERT_ALPHA_SUPPORTED
115+#define PNG_READ_INVERT_SUPPORTED
116+#define PNG_READ_OPT_PLTE_SUPPORTED
117+#define PNG_READ_PACKSWAP_SUPPORTED
118+#define PNG_READ_PACK_SUPPORTED
119+#define PNG_READ_QUANTIZE_SUPPORTED
120+#define PNG_READ_RGB_TO_GRAY_SUPPORTED
121+#define PNG_READ_SCALE_16_TO_8_SUPPORTED
122+#define PNG_READ_SHIFT_SUPPORTED
123+#define PNG_READ_STRIP_16_TO_8_SUPPORTED
124+#define PNG_READ_STRIP_ALPHA_SUPPORTED
125+#define PNG_READ_SUPPORTED
126+#define PNG_READ_SWAP_ALPHA_SUPPORTED
127+#define PNG_READ_SWAP_SUPPORTED
128+#define PNG_READ_TEXT_SUPPORTED
129+#define PNG_READ_TRANSFORMS_SUPPORTED
130+#define PNG_READ_UNKNOWN_CHUNKS_SUPPORTED
131+#define PNG_READ_USER_CHUNKS_SUPPORTED
132+#define PNG_READ_USER_TRANSFORM_SUPPORTED
133+#define PNG_READ_bKGD_SUPPORTED
134+#define PNG_READ_cHRM_SUPPORTED
135+#define PNG_READ_eXIf_SUPPORTED
136+#define PNG_READ_gAMA_SUPPORTED
137+#define PNG_READ_hIST_SUPPORTED
138+#define PNG_READ_iCCP_SUPPORTED
139+#define PNG_READ_iTXt_SUPPORTED
140+#define PNG_READ_oFFs_SUPPORTED
141+#define PNG_READ_pCAL_SUPPORTED
142+#define PNG_READ_pHYs_SUPPORTED
143+#define PNG_READ_sBIT_SUPPORTED
144+#define PNG_READ_sCAL_SUPPORTED
145+#define PNG_READ_sPLT_SUPPORTED
146+#define PNG_READ_sRGB_SUPPORTED
147+#define PNG_READ_tEXt_SUPPORTED
148+#define PNG_READ_tIME_SUPPORTED
149+#define PNG_READ_tRNS_SUPPORTED
150+#define PNG_READ_zTXt_SUPPORTED
151+#define PNG_SAVE_INT_32_SUPPORTED
152+#define PNG_SAVE_UNKNOWN_CHUNKS_SUPPORTED
153+#define PNG_SEQUENTIAL_READ_SUPPORTED
154+#define PNG_SETJMP_SUPPORTED
155+#define PNG_SET_OPTION_SUPPORTED
156+#define PNG_SET_UNKNOWN_CHUNKS_SUPPORTED
157+#define PNG_SET_USER_LIMITS_SUPPORTED
158+#define PNG_SIMPLIFIED_READ_AFIRST_SUPPORTED
159+#define PNG_SIMPLIFIED_READ_BGR_SUPPORTED
160+#define PNG_SIMPLIFIED_READ_SUPPORTED
161+#define PNG_SIMPLIFIED_WRITE_AFIRST_SUPPORTED
162+#define PNG_SIMPLIFIED_WRITE_BGR_SUPPORTED
163+#define PNG_SIMPLIFIED_WRITE_STDIO_SUPPORTED
164+#define PNG_SIMPLIFIED_WRITE_SUPPORTED
165+#define PNG_STDIO_SUPPORTED
166+#define PNG_STORE_UNKNOWN_CHUNKS_SUPPORTED
167+#define PNG_TEXT_SUPPORTED
168+#define PNG_TIME_RFC1123_SUPPORTED
169+#define PNG_UNKNOWN_CHUNKS_SUPPORTED
170+#define PNG_USER_CHUNKS_SUPPORTED
171+#define PNG_USER_LIMITS_SUPPORTED
172+#define PNG_USER_MEM_SUPPORTED
173+#define PNG_USER_TRANSFORM_INFO_SUPPORTED
174+#define PNG_USER_TRANSFORM_PTR_SUPPORTED
175+#define PNG_WARNINGS_SUPPORTED
176+#define PNG_WRITE_16BIT_SUPPORTED
177+#define PNG_WRITE_ANCILLARY_CHUNKS_SUPPORTED
178+#define PNG_WRITE_BGR_SUPPORTED
179+#define PNG_WRITE_CHECK_FOR_INVALID_INDEX_SUPPORTED
180+#define PNG_WRITE_COMPRESSED_TEXT_SUPPORTED
181+#define PNG_WRITE_CUSTOMIZE_COMPRESSION_SUPPORTED
182+#define PNG_WRITE_CUSTOMIZE_ZTXT_COMPRESSION_SUPPORTED
183+#define PNG_WRITE_FILLER_SUPPORTED
184+#define PNG_WRITE_FILTER_SUPPORTED
185+#define PNG_WRITE_FLUSH_SUPPORTED
186+#define PNG_WRITE_GET_PALETTE_MAX_SUPPORTED
187+#define PNG_WRITE_INTERLACING_SUPPORTED
188+#define PNG_WRITE_INT_FUNCTIONS_SUPPORTED
189+#define PNG_WRITE_INVERT_ALPHA_SUPPORTED
190+#define PNG_WRITE_INVERT_SUPPORTED
191+#define PNG_WRITE_OPTIMIZE_CMF_SUPPORTED
192+#define PNG_WRITE_PACKSWAP_SUPPORTED
193+#define PNG_WRITE_PACK_SUPPORTED
194+#define PNG_WRITE_SHIFT_SUPPORTED
195+#define PNG_WRITE_SUPPORTED
196+#define PNG_WRITE_SWAP_ALPHA_SUPPORTED
197+#define PNG_WRITE_SWAP_SUPPORTED
198+#define PNG_WRITE_TEXT_SUPPORTED
199+#define PNG_WRITE_TRANSFORMS_SUPPORTED
200+#define PNG_WRITE_UNKNOWN_CHUNKS_SUPPORTED
201+#define PNG_WRITE_USER_TRANSFORM_SUPPORTED
202+#define PNG_WRITE_WEIGHTED_FILTER_SUPPORTED
203+#define PNG_WRITE_bKGD_SUPPORTED
204+#define PNG_WRITE_cHRM_SUPPORTED
205+#define PNG_WRITE_eXIf_SUPPORTED
206+#define PNG_WRITE_gAMA_SUPPORTED
207+#define PNG_WRITE_hIST_SUPPORTED
208+#define PNG_WRITE_iCCP_SUPPORTED
209+#define PNG_WRITE_iTXt_SUPPORTED
210+#define PNG_WRITE_oFFs_SUPPORTED
211+#define PNG_WRITE_pCAL_SUPPORTED
212+#define PNG_WRITE_pHYs_SUPPORTED
213+#define PNG_WRITE_sBIT_SUPPORTED
214+#define PNG_WRITE_sCAL_SUPPORTED
215+#define PNG_WRITE_sPLT_SUPPORTED
216+#define PNG_WRITE_sRGB_SUPPORTED
217+#define PNG_WRITE_tEXt_SUPPORTED
218+#define PNG_WRITE_tIME_SUPPORTED
219+#define PNG_WRITE_tRNS_SUPPORTED
220+#define PNG_WRITE_zTXt_SUPPORTED
221+#define PNG_bKGD_SUPPORTED
222+#define PNG_cHRM_SUPPORTED
223+#define PNG_eXIf_SUPPORTED
224+#define PNG_gAMA_SUPPORTED
225+#define PNG_hIST_SUPPORTED
226+#define PNG_iCCP_SUPPORTED
227+#define PNG_iTXt_SUPPORTED
228+#define PNG_oFFs_SUPPORTED
229+#define PNG_pCAL_SUPPORTED
230+#define PNG_pHYs_SUPPORTED
231+#define PNG_sBIT_SUPPORTED
232+#define PNG_sCAL_SUPPORTED
233+#define PNG_sPLT_SUPPORTED
234+#define PNG_sRGB_SUPPORTED
235+#define PNG_tEXt_SUPPORTED
236+#define PNG_tIME_SUPPORTED
237+#define PNG_tRNS_SUPPORTED
238+#define PNG_zTXt_SUPPORTED
239+/* end of options */
240+/* settings */
241+#define PNG_API_RULE 0
242+#define PNG_DEFAULT_READ_MACROS 1
243+#define PNG_GAMMA_THRESHOLD_FIXED 5000
244+#define PNG_IDAT_READ_SIZE PNG_ZBUF_SIZE
245+#define PNG_INFLATE_BUF_SIZE 1024
246+#define PNG_LINKAGE_API extern
247+#define PNG_LINKAGE_CALLBACK extern
248+#define PNG_LINKAGE_DATA extern
249+#define PNG_LINKAGE_FUNCTION extern
250+#define PNG_MAX_GAMMA_8 11
251+#define PNG_QUANTIZE_BLUE_BITS 5
252+#define PNG_QUANTIZE_GREEN_BITS 5
253+#define PNG_QUANTIZE_RED_BITS 5
254+#define PNG_TEXT_Z_DEFAULT_COMPRESSION (-1)
255+#define PNG_TEXT_Z_DEFAULT_STRATEGY 0
256+#define PNG_USER_CHUNK_CACHE_MAX 1000
257+#define PNG_USER_CHUNK_MALLOC_MAX 8000000
258+#define PNG_USER_HEIGHT_MAX 1000000
259+#define PNG_USER_WIDTH_MAX 1000000
260+#define PNG_ZBUF_SIZE 8192
261+#define PNG_ZLIB_VERNUM 0 /* unknown */
262+#define PNG_Z_DEFAULT_COMPRESSION (-1)
263+#define PNG_Z_DEFAULT_NOFILTER_STRATEGY 0
264+#define PNG_Z_DEFAULT_STRATEGY 1
265+#define PNG_sCAL_PRECISION 5
266+#define PNG_sRGB_PROFILE_CHECKS 2
267+/* end of settings */
268+#endif /* PNGLCONF_H */
269