Revert of Switch SkJpegCode to libjpeg-turbo

gyp/codec.gyp

Index: gyp/codec.gyp
diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index c008590dad4c859d1d57ecb9e72f8088e2c2e9b7..0d541845827d8b9c86b250eaf1a3d9e06ad082f4 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -18,11 +18,8 @@
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
-        'libjpeg-turbo.gyp:libjpeg-turbo',
+        'libjpeg.gyp:libjpeg',
         'libwebp.gyp:libwebp',
-      ],
-      'export_dependent_settings': [
-        'libjpeg-turbo.gyp:libjpeg-turbo',
       ],
       'cflags':[
         # FIXME: This gets around a longjmp warning. See
@@ -63,22 +60,9 @@
             'dependencies': [
               'libpng.gyp:libpng',
             ],
-            # TODO(msarett): update libjpeg-turbo on Android so we can compile SkJpegCodec
-            # for the framework.
-            'sources!': [
-              '../src/codec/SkJpegCodec.cpp',
-              '../src/codec/SkJpegDecoderMgr.cpp',
-              '../src/codec/SkJpegUtility_codec.cpp',
-            ],
-            'dependencies!': [
-              'libjpeg-turbo.gyp:libjpeg-turbo',
-            ],
           }, {  # !skia_android_framework
             'dependencies': [
               'libpng.gyp:libpng_static',
-            ],
-            'cflags': [
-              '-DTURBO_HAS_SKIP',
             ],
           }
         ]