Update to libpng 1.6.19
Removes all Android modifications, including
SK_PNG_INDEX_SUPPORTED (for subset decoding).
BUG:23265085
BUG:25424175
Change-Id: Iaa4f6cc9fc6db8e4b46a83211363adfcbf07b589
diff --git a/scripts/makefile.hpux b/scripts/makefile.hpux
index bef2e23..b07612d 100644
--- a/scripts/makefile.hpux
+++ b/scripts/makefile.hpux
@@ -66,6 +66,10 @@
DL=$(DESTDIR)$(LIBPATH)
DM=$(DESTDIR)$(MANPATH)
+# Pre-built configuration
+# See scripts/pnglibconf.mak for more options
+PNGLIBCONF_H_PREBUILT = scripts/pnglibconf.h.prebuilt
+
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
pngwtran.o pngmem.o pngerror.o pngpread.o
@@ -82,9 +86,8 @@
all: libpng.a $(LIBSO) pngtest libpng.pc libpng-config
-# see scripts/pnglibconf.mak for more options
-pnglibconf.h: scripts/pnglibconf.h.prebuilt
- cp scripts/pnglibconf.h.prebuilt $@
+pnglibconf.h: $(PNGLIBCONF_H_PREBUILT)
+ $(CP) $(PNGLIBCONF_H_PREBUILT) $@
libpng.a: $(OBJS)
$(AR_RC) $@ $(OBJS)
@@ -101,7 +104,7 @@
( cat scripts/libpng-config-head.in; \
echo prefix=\"$(prefix)\"; \
echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- echo ccopts=\"-Ae +DA1.1 +DS2.0\"; \
+ echo ccopts=\"-O -Ae +DA1.1 +DS2.0\"; \
echo L_opts=\"-L$(LIBPATH)\"; \
echo libs=\"-lpng16 -lz -lm\"; \
cat scripts/libpng-config-body.in ) > libpng-config