Remove dependencies on Android's forked decoder libraries

gyp/codec.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.
 # 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 codec project.
 {
   'targets': [
     {
       'target_name': 'codec',
       'product_name': 'skia_codec',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
+        'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
+        'libpng.gyp:libpng',
         'libwebp.gyp:libwebp',
       ],
       'cflags':[
         # FIXME: This gets around a longjmp warning. See
         # http://build.chromium.org/p/client.skia.compile/builders/Build-Ubuntu-GCC-x86_64-Release-Trybot/builds/113/steps/build%20most/logs/stdio
         '-Wno-clobbered',
       ],
       'include_dirs': [
         '../include/codec',
         '../include/private',
@@ skipping 20 matching lines @@
         '../src/codec/SkSampledCodec.cpp',
         '../src/codec/SkSwizzler.cpp',
         '../src/codec/SkWebpAdapterCodec.cpp',
         '../src/codec/SkWebpCodec.cpp',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../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',
-            ],
-            # TODO(msarett): Add libjpeg-turbo to Android so we can compile SkJpegCodec
-            # for the framework.
-            'sources!': [
-              '../src/codec/SkJpegCodec.cpp',
-              '../src/codec/SkJpegDecoderMgr.cpp',
-              '../src/codec/SkJpegUtility_codec.cpp',
-            ],
-          }, {  # !skia_android_framework
-            'dependencies': [
-              # TODO(msarett): Add libjpeg-turbo to Android so this can be a global
-              # dependency.
-              'libjpeg-turbo.gyp:libjpeg-turbo',
-              'libpng.gyp:libpng_static',
-            ],
-            'export_dependent_settings': [
-              'libjpeg-turbo.gyp:libjpeg-turbo',
-            ],
-            'defines': [
-              'TURBO_HAS_SKIP',
-            ],
-          }
-        ]
-      ]
+      'defines': [
+        'TURBO_HAS_SKIP',
+      ],
     },
   ],
 }