Remove dependencies on Android's forked decoder libraries

gyp/images.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # GYP file for images project.
 {
   'targets': [
     {
       'target_name': 'images',
       'product_name': 'skia_images',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
-        'libjpeg.gyp:*',
+        'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
         'etc1.gyp:libetc1',
         'ktx.gyp:libSkKTX',
         'libwebp.gyp:libwebp',
         'utils.gyp:utils',
       ],
       'include_dirs': [
         '../include/images',
         '../include/private',
         '../src/lazy',
         # for access to SkErrorInternals.h
@@ skipping 81 matching lines @@
             '../src/images/SkImageDecoder_libpng.cpp',
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
         },{ #else if skia_os != mac
           'sources!': [
             '../src/ports/SkImageDecoder_CG.cpp',
           ],
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
-          'export_dependent_settings': [
-            'libpng.gyp:libpng',
-          ],
           'dependencies': [
             'libpng.gyp:libpng',
           ],
           # end libpng stuff
         }],
         [ 'skia_os == "android"', {
           '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),
             # there is a missing space between a literal and an identifier
             # in png.h, triggering a warning in C++11.
             '-Wno-literal-suffix',
           ],
+          'dependencies': [
+            'libpng.gyp:libpng',
+          ],
           'conditions': [
-            [ 'skia_android_framework == 0', {
-              'export_dependent_settings': [
-                'android_deps.gyp:png',
-                'libjpeg.gyp:*'
-              ],
-            }, {
+            [ 'skia_android_framework == 1', {
               # The android framework disables these decoders as they are of little use to
               # Java applications that can't take advantage of the compressed formats.
               'sources!': [
                 '../src/images/SkImageDecoder_pkm.cpp',
                 '../src/images/SkImageDecoder_ktx.cpp',
                 '../src/images/SkImageDecoder_astc.cpp',
               ],
             }],
           ],
         }],
         [ 'skia_os == "chromeos"', {
           'dependencies': [
             'libpng.gyp:libpng',
           ],
         }],
         [ 'skia_os == "ios"', {
            'include_dirs': [
              '../include/utils/mac',
            ],
         }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/images',
         ],
       },
     },
   ],
 }