Remove dependencies on Android's forked decoder libraries

gyp/images.gyp

Index: gyp/images.gyp
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 3c46ec1a8f0bf659bedc21feea5f1ab9278a5ed9..e1f925d4cb72006d2d223b5711111c6ff8315831 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -14,7 +14,6 @@
       'dependencies': [
         'core.gyp:*',
         'giflib.gyp:giflib',
-        'libjpeg.gyp:*',
         'etc1.gyp:libetc1',
         'ktx.gyp:libSkKTX',
         'libwebp.gyp:libwebp',
@@ -83,6 +82,14 @@
         '../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',
@@ -128,9 +135,6 @@
           '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),
@@ -140,9 +144,11 @@
           ],
           '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
@@ -152,6 +158,10 @@
                 '../src/images/SkImageDecoder_ktx.cpp',
                 '../src/images/SkImageDecoder_astc.cpp',
               ],
+              'dependencies': [
+                'android_deps.gyp:libjpeg-turbo',
+                'android_deps.gyp:png',
+              ],
             }],
           ],
         }],