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..db3ca37222d4338544026d6a880473913bbe6f17 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -18,6 +18,7 @@
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
+        'libjpeg-turbo.gyp:libjpeg-turbo',

[scroggo, 2015/11/04 19:28:23]

I think you need to update libjpeg-turbo.gyp to handle skia_android_framework.

IIUC, libjpeg-turbo.gyp tells us to build a bunch of files in third_party, but
instead you just want to include libjpeg-turbo as a shared library.

I think gyp/android_deps.gyp is the right example. For png, instead of building
anything, we just add a library and an include_dir:

            'direct_dependent_settings': {
              'libraries' : [
                '-lpng',
              ],
              'include_dirs': [
                'external/libpng',
              ],

We do the same thing for jpeg. So I think this needs to be updated to use
libjpeg-turbo.

[msarett, 2015/11/05 15:00:56]

You're right, there's quite a bit more gyp work to do.

         'libwebp.gyp:libwebp',
       ],
       'cflags':[
@@ -66,18 +67,8 @@
             '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': [