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',

[scroggo, 2015/11/05 18:35:53]

It's weird to me that we directly use libpng.gyp here, which in turn decides
between libpng_static and android_deps:libpng, but we make the decision about
libjpeg-turbo vs android_deps:libjpeg_turbo.

[msarett, 2015/11/05 22:13:25]

Moving the decision out of this file.

             ],
-            # 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',

[scroggo, 2015/11/05 18:35:53]

Do we still need libpng_static? I thought it was only around so we could build
two versions of libpng - one for codec, and one for imagedecoder.

(I guess it may still be handy within the file to label one as static, but I
don't see why images.gyp or codec.gyp need to make the distinction.)

[msarett, 2015/11/05 22:13:25]

I think we're fine to include libpng now.  I think it will end up choosing
libpng_static unless we are on the framework.  Punting on whether or not a
static library is this is the right decision...

[scroggo, 2015/11/05 22:24:55]

Oh, sorry, I didn't mean we should not build a static library; I just wondered
whether we needed to distinguish that in the name.

             ],
             'export_dependent_settings': [
               'libjpeg-turbo.gyp:libjpeg-turbo',
             ],
-            'defines': [
-              'TURBO_HAS_SKIP',
-            ],
           }
         ]
       ]
     },
   ],
 }