libpng: update to 1.6.32, pull using DEPS

I'd have done this as two steps, but we didn't have a pure copy of
libpng to start with.  The patches we did have, though, have been
upstreamed and are now unneeded.

Change-Id: I884b9bc47afe5000f5a521f66a3bb95c0411b39a
Reviewed-on: https://skia-review.googlesource.com/48620
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Mike Klein <mtklein@chromium.org>

1 files changed, 23 insertions, 20 deletions

diff --git a/third_party/libpng/BUILD.gn b/third_party/libpng/BUILD.gn
index 6a4c65732c..a01ede6501 100644
--- a/third_party/libpng/BUILD.gn
+++ b/third_party/libpng/BUILD.gn
@@ -15,42 +15,45 @@ if (skia_use_system_libpng) {
   }
 } else {
   third_party("libpng") {
-    public_include_dirs = [ "." ]
+    public_include_dirs = [
+      ".",
+      "../externals/libpng",
+    ]
 
     defines = []
     deps = [
       "//third_party/zlib",
     ]
     sources = [
-      "png.c",
-      "pngerror.c",
-      "pngget.c",
-      "pngmem.c",
-      "pngpread.c",
-      "pngread.c",
-      "pngrio.c",
-      "pngrtran.c",
-      "pngrutil.c",
-      "pngset.c",
-      "pngtrans.c",
-      "pngwio.c",
-      "pngwrite.c",
-      "pngwtran.c",
-      "pngwutil.c",
+      "../externals/libpng/png.c",
+      "../externals/libpng/pngerror.c",
+      "../externals/libpng/pngget.c",
+      "../externals/libpng/pngmem.c",
+      "../externals/libpng/pngpread.c",
+      "../externals/libpng/pngread.c",
+      "../externals/libpng/pngrio.c",
+      "../externals/libpng/pngrtran.c",
+      "../externals/libpng/pngrutil.c",
+      "../externals/libpng/pngset.c",
+      "../externals/libpng/pngtrans.c",
+      "../externals/libpng/pngwio.c",
+      "../externals/libpng/pngwrite.c",
+      "../externals/libpng/pngwtran.c",
+      "../externals/libpng/pngwutil.c",
     ]
 
     if (current_cpu == "arm" || current_cpu == "arm64") {
       sources += [
-        "arm/arm_init.c",
-        "arm/filter_neon_intrinsics.c",
+        "../externals/libpng/arm/arm_init.c",
+        "../externals/libpng/arm/filter_neon_intrinsics.c",
       ]
     }
 
     if (current_cpu == "x86" || current_cpu == "x64") {
       defines += [ "PNG_INTEL_SSE" ]
       sources += [
-        "contrib/intel/filter_sse2_intrinsics.c",
-        "contrib/intel/intel_init.c",
+        "../externals/libpng/intel/filter_sse2_intrinsics.c",
+        "../externals/libpng/intel/intel_init.c",
       ]
     }
   }