Add SkCodec, including PNG implementation.

gyp/libpng.gyp

Index: gyp/libpng.gyp
diff --git a/gyp/libpng.gyp b/gyp/libpng.gyp
index 92ff8d5e77cdf4a6acc98092096af7ef63af4318..e87cbcea9b8c3ba5776e137e27bb473a466c2266 100644
--- a/gyp/libpng.gyp
+++ b/gyp/libpng.gyp
@@ -20,9 +20,6 @@
             'dependencies': [
               'zlib.gyp:zlib',
             ],
-            'export_dependent_settings': [
-              'zlib.gyp:zlib',
-            ],
             'direct_dependent_settings': {
               'include_dirs': [
                 '../third_party/externals/libpng',
@@ -32,10 +29,25 @@
               '-w',
               '-fvisibility=hidden',
             ],
+            'actions': [
+              {
+                'action_name': 'generate_pngconf',
+                'variables' : {
+                  'prebuilt': '../third_party/externals/libpng/scripts/pnglibconf.h.prebuilt',
+                  'generated': '../third_party/externals/libpng/pnglibconf.h',
+                },
+                'inputs': [
+                  '<(prebuilt)',
+                ],
+                'outputs': [
+                  '<(generated)',
+                ],
+                'action': ['python', 'copy_file.py', '<(prebuilt)', '<(generated)'],
+              },
+            ],
             'sources': [
               '../third_party/externals/libpng/png.c',
               '../third_party/externals/libpng/pngerror.c',
-              '../third_party/externals/libpng/pnggccrd.c',
               '../third_party/externals/libpng/pngget.c',
               '../third_party/externals/libpng/pngmem.c',
               '../third_party/externals/libpng/pngpread.c',
@@ -45,7 +57,6 @@
               '../third_party/externals/libpng/pngrutil.c',
               '../third_party/externals/libpng/pngset.c',
               '../third_party/externals/libpng/pngtrans.c',
-              '../third_party/externals/libpng/pngvcrd.c',
               '../third_party/externals/libpng/pngwio.c',
               '../third_party/externals/libpng/pngwrite.c',
               '../third_party/externals/libpng/pngwtran.c',
@@ -53,33 +64,19 @@
             ],
           }, {  # not skia_libpng_static
             'type': 'none',
-            'conditions': [
-              [ 'skia_os == "android"',
-                {
-                  # TODO(halcanary): merge all png targets into this file.
-                  'dependencies': [
-                    'android_deps.gyp:png',
-                  ],
-                  'export_dependent_settings': [
-                    'android_deps.gyp:png',
-                  ],
-                }, {  # skia_os != "android"
-                  'dependencies': [
-                    'zlib.gyp:zlib',
-                    ],
-                  'export_dependent_settings': [
-                    'zlib.gyp:zlib',
-                    ],
-                  'direct_dependent_settings': {
-                    'link_settings': {
-                      'libraries': [
-                        '-lpng',
-                      ],
-                    },
-                  },
-                }
-              ]
-            ]
+            'dependencies': [
+              'zlib.gyp:zlib',
+            ],
+            'export_dependent_settings': [
+              'zlib.gyp:zlib',
+            ],
+            'direct_dependent_settings': {
+              'link_settings': {
+                'libraries': [
+                    '-lpng',
+                ],
+              },
+            },
           }
         ]
       ],