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.
@@ skipping 40 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',
         ],
       },
+      'defines': [
+        'TURBO_HAS_SKIP',
+      ],
       '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',
+              'android_deps.gyp:libjpeg-turbo',
             ],
-            # 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',
+            'export_dependent_settings': [
+              'android_deps.gyp:libjpeg-turbo'
             ],
           }, {  # !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',
-            ],
           }
         ]
       ]
     },
   ],
 }