Remove dependencies on Android's forked decoder libraries

gyp/images.gyp

Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 3c46ec1a8f0bf659bedc21feea5f1ab9278a5ed9..250548e39e71ca04df978be338060714f4012721 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -14,7 +14,7 @@
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
-        'libjpeg.gyp:*',
+        'libjpeg-turbo.gyp:libjpeg-turbo',

[msarett, 2015/11/05 15:39:59]

This file still needs to be fixed.

         'etc1.gyp:libetc1',
         'ktx.gyp:libSkKTX',
         'libwebp.gyp:libwebp',
@@ -128,9 +128,6 @@
           'include_dirs': [
              '../src/utils',
           ],
-          'dependencies': [
-             'android_deps.gyp:png',
-          ],
           'cflags' : [
             # SkImageDecoder_libpng includes png.h.
             # In the version of libpng that we use on Android (1.2.46),
@@ -140,9 +137,11 @@
           ],
           'conditions': [
             [ 'skia_android_framework == 0', {
+              'dependencies': [
+                'libpng.gyp:libpng',
+              ],
               'export_dependent_settings': [
-                'android_deps.gyp:png',
-                'libjpeg.gyp:*'
+                'libpng.gyp:libpng',
               ],
             }, {
               # The android framework disables these decoders as they are of little use to
@@ -152,6 +151,9 @@
                 '../src/images/SkImageDecoder_ktx.cpp',
                 '../src/images/SkImageDecoder_astc.cpp',
               ],
+              'dependencies': [
+                 'android_deps.gyp:png',
+              ],
             }],
           ],
         }],