Remove dependencies on Android's forked decoder libraries

gyp/codec.gyp

Index: gyp/codec.gyp
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index 3888d4f3701d491ab0a26ee1a2e48f736896bc57..6d12ae523b88a702c421333a484446e18b367e3b 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -58,6 +58,9 @@
           '../include/codec',
         ],
       },
+      'defines': [
+        'TURBO_HAS_SKIP',
+      ],
       'conditions': [
         [ 'skia_android_framework == 1',
           {
@@ -65,27 +68,19 @@
             # 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',
-            ],
           }
         ]
       ]