WIP: Added support for giflib, updated jpeg and png

gyp/giflib.gyp

 # Copyright 2014 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'skia_warnings_as_errors': 0,
   },
   'targets': [
     {
       'target_name': 'giflib',
       'conditions': [
-        [ 'skia_giflib_static',

[msarett, 2015/03/26 18:22:46]

As far as I can tell, this is always 0.  So past code always used -lgif.

[scroggo, 2015/03/26 18:29:34]

Dead code. We should probably remove skia_giflib_static.

[msarett, 2015/03/26 21:06:23]

Done.

+        [ 'skia_os != "android"',
           {
             'type': 'static_library',
             'defines': [
               'HAVE_CONFIG_H',
             ],
             'include_dirs': [
               '../third_party/externals/giflib',
             ],
             'dependencies': [
             ],
             'direct_dependent_settings': {
               'include_dirs': [
                 '../third_party/externals/giflib',
               ],
             },
             'cflags': [
               '-w',
             ],
             'sources': [
               '../third_party/externals/giflib/dgif_lib.c',
               '../third_party/externals/giflib/gifalloc.c',
               '../third_party/externals/giflib/gif_err.c',
             ],
-          }, {  # not skia_giflib_static
-            'type': 'none',
-            'direct_dependent_settings': {
-              'link_settings': {
-                'libraries': [
-                  '-lgif',
-                ],
-              },
-            },
+          }, {  # skia_os == "android"

[djsollen, 2015/03/26 19:51:05]

let's not make the distinction between android and other platforms for libgif as
they all build using the same sources.

[scroggo, 2015/03/26 20:10:11]

We *do* need to make a distinction for skia_android_framework though. I think
android_deps takes care of that for you, so you'll need to move that code here.

[msarett, 2015/03/26 21:06:23]

Gotcha.

+            'type': 'static_library',
+            'dependencies': [
+              'android_deps.gyp:gif',

[msarett, 2015/03/26 18:22:46]

For android, do what images.gyp does and use android's library.

+            ],
           }
         ],
       ]
     }
   ]
 }