Enable both static and dynamically linked libpng

gyp/codec.gyp

Index: gyp/codec.gyp
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index eb49f6cd5cc76e297bd0a5a995b66c91f6fc5106..13737739401e1ee62fb30c61b1496c489212b17a 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -18,7 +18,6 @@
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
-        'libpng.gyp:libpng',
       ],
       'cflags':[
         # FIXME: This gets around a longjmp warning. See
@@ -47,6 +46,21 @@
           '../include/codec',
         ],
       },
+      'conditions': [
+        [ 'skia_android_framework == 1',
+          {
+            # TODO(djsollen): this is a temporary dependency until we can update
+            # the android framework to a more recent version of libpng.
+            'dependencies': [
+              'libpng.gyp:libpng',
+            ],
+          }, {  # !skia_android_framework
+            'dependencies': [
+              'libpng.gyp:libpng_static',
+            ],
+          }
+        ]
+      ]
     },
   ],
 }