Update skia to test with libpng to 1.6.10

platform_tools/android/gyp/dependencies.gypi

Index: platform_tools/android/gyp/dependencies.gypi
diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index f6298c1558da8ca283db47384a902829b24f764a..a1e70e092da4414ec9152e2bb3f550c0ae49d201 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -94,7 +94,6 @@
       'sources': [
         '../third_party/externals/png/png.c',
         '../third_party/externals/png/pngerror.c',
-        '../third_party/externals/png/pnggccrd.c',
         '../third_party/externals/png/pngget.c',
         '../third_party/externals/png/pngmem.c',
         '../third_party/externals/png/pngpread.c',
@@ -104,12 +103,27 @@
         '../third_party/externals/png/pngrutil.c',
         '../third_party/externals/png/pngset.c',
         '../third_party/externals/png/pngtrans.c',
-        '../third_party/externals/png/pngvcrd.c',
         '../third_party/externals/png/pngwio.c',
         '../third_party/externals/png/pngwrite.c',
         '../third_party/externals/png/pngwtran.c',
         '../third_party/externals/png/pngwutil.c',
       ],
+      # TODO (msarett): Enable testing of Arm NEON opts.
+      # Currently we cannot compile because there is a namespace conflict with
+      # skia/third_party/externals/libpng.

[scroggo, 2015/08/26 21:53:32]

nit: Can you explain (briefly) why there is a conflict? (I am guessing this is
temporary, due to the two versions of libpng - the forked version used by
SkImageDecoder and the version used by SkCodec?)

+      'conditions': [
+        [ '("arm" in skia_arch_type) and (arm_version >= 7) and \
+           (arm_neon == 1 or arm_neon_optional == 1)', {
+          'sources': [
+            '../third_party/externals/png/arm/arm_init.c',
+            '../third_party/externals/png/arm/filter_neon.S',
+            '../third_party/externals/png/arm/filter_neon_intrinsics.c',
+          ],
+          'cflags': [
+            '-DPNG_ARM_NEON_OPT=2',
+          ],
+        }],
+      ],
       'include_dirs': [
         '../third_party/externals/png',
       ],