Remove dependencies on Android's forked decoder libraries

gyp/images.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.
 
 # GYP file for images project.
 {
   'targets': [
     {
       'target_name': 'images',
       'product_name': 'skia_images',
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
-        'libjpeg.gyp:*',
         'etc1.gyp:libetc1',
         'ktx.gyp:libSkKTX',
         'libwebp.gyp:libwebp',
         'utils.gyp:utils',
       ],
       'include_dirs': [
         '../include/images',
         '../include/private',
         '../src/lazy',
         # for access to SkErrorInternals.h
@@ skipping 48 matching lines @@
         '../src/images/SkPageFlipper.cpp',
         '../src/images/SkScaledBitmapSampler.cpp',
         '../src/images/SkScaledBitmapSampler.h',
 
         '../src/ports/SkImageGenerator_skia.cpp',
 
         '../src/ports/SkImageDecoder_CG.cpp',
         '../src/ports/SkImageDecoder_WIC.cpp',
       ],
       'conditions': [
+        [ 'skia_android_framework == 0', {

[msarett, 2015/11/05 16:14:04]

It would be cleaner to include this above and then use dependencies! down below.

Unfortunately, they gyp generators for the android framework will try to parse
this file before hitting dependencies! and ignoring it.  It fails to parse
because host_os is not defined (we define this in android_setup.sh).

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

Yeah, this is an annoying feature of gyp itself - it will parse files it doesn't
need to. It might be worth adding a comment in the code about this.

+          'dependencies': [
+            'libjpeg-turbo.gyp:libjpeg-turbo',
+          ],
+          'export_dependent_settings': [
+            'libjpeg-turbo.gyp:libjpeg-turbo',
+          ],
+        }],
         [ 'skia_os == "win"', {
           'sources!': [
             '../src/images/SkImageDecoder_FactoryDefault.cpp',
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkImageDecoder_libpng.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
           'dependencies!': [
             'giflib.gyp:giflib'
           ],
@@ skipping 13 matching lines @@
             '../src/images/SkImageDecoder_libpng.cpp',
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
         },{ #else if skia_os != mac
           'sources!': [
             '../src/ports/SkImageDecoder_CG.cpp',
           ],
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
           'export_dependent_settings': [

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

Why did this get removed? Is this a separate cleanup?

[msarett, 2015/11/05 22:39:53]

This is a clean-up.  libpng.gyp will choose either libpng_static or
android_deps:libpng and also add that to export_dependent_settings.  So I don't
think it is necessary to set export_dependent_settings here.

             'libpng.gyp:libpng',
           ],
           'dependencies': [
             'libpng.gyp:libpng',
           ],
           # end libpng stuff
         }],
         [ 'skia_os == "android"', {
           'include_dirs': [
              '../src/utils',
           ],
-          'dependencies': [
-             'android_deps.gyp:png',
-          ],
           'cflags' : [
             # SkImageDecoder_libpng includes png.h.
             # In the version of libpng that we use on Android (1.2.46),
             # there is a missing space between a literal and an identifier
             # in png.h, triggering a warning in C++11.
             '-Wno-literal-suffix',
           ],
           'conditions': [
             [ 'skia_android_framework == 0', {
+              'dependencies': [
+                'libpng.gyp:libpng',

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

I'm confused: images.gyp seems a lot more complicated than codec.gyp. It used to
be more complicated because we had to worry about modified versions of
libjpeg/libpng. But now, they should be using the same versions as each other
everywhere, correct?

codec.gyp has one condition:
if skia_android_framework:
  libpng
  android_deps:libjpeg-turbo
else:
  libpng_static
  libjpeg-turbo

Can this one be simplified?

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

You're right we can simplify this.

+              ],
               'export_dependent_settings': [
-                'android_deps.gyp:png',
-                'libjpeg.gyp:*'
+                'libpng.gyp:libpng',
               ],
             }, {
               # The android framework disables these decoders as they are of little use to
               # Java applications that can't take advantage of the compressed formats.
               'sources!': [
                 '../src/images/SkImageDecoder_pkm.cpp',
                 '../src/images/SkImageDecoder_ktx.cpp',
                 '../src/images/SkImageDecoder_astc.cpp',
               ],
+              'dependencies': [
+                'android_deps.gyp:libjpeg-turbo',
+                'android_deps.gyp:png',
+              ],
             }],
           ],
         }],
         [ 'skia_os == "chromeos"', {
           'dependencies': [
             'libpng.gyp:libpng',
           ],
         }],
         [ 'skia_os == "ios"', {
            'include_dirs': [
              '../include/utils/mac',
            ],
         }],
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../include/images',
         ],
       },
     },
   ],
 }