From 6fe16d3f58937957351fb347a7b1dffa0e0768bc Mon Sep 17 00:00:00 2001
From: scroggo <scroggo@chromium.org>
Date: Thu, 27 Oct 2016 12:24:43 -0700
Subject: Remove SkMovie and giflib

SkMovie is not used in any of our tests or by Chromium. It is also not
supported by GN. It is being moved into Android, its only client, so we
can delete it here.

giflib is only used by SkMovie, so stop pulling/building it.

TBR=reed@google.com

GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=3945

Change-Id: I28a8155fd59e139bb21ec2295cc22fdced034284
Review-Url: https://codereview.chromium.org/2449213004
---
 gyp/giflib.gyp | 73 ----------------------------------------------------------
 gyp/images.gyp | 14 -----------
 2 files changed, 87 deletions(-)
 delete mode 100644 gyp/giflib.gyp

(limited to 'gyp')

diff --git a/gyp/giflib.gyp b/gyp/giflib.gyp
deleted file mode 100644
index f4f853200f..0000000000
--- a/gyp/giflib.gyp
+++ /dev/null
@@ -1,73 +0,0 @@
-# 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_android_framework == 0',
-          {
-            'type': 'static_library',
-            'include_dirs': [
-              '../third_party/externals/giflib',
-            ],
-            'dependencies': [
-            ],
-            'direct_dependent_settings': {
-              'include_dirs': [
-                '../third_party/externals/giflib',
-              ],
-            },
-            'cflags': [
-              '-w',
-            ],
-            'xcode_settings': {
-              'WARNING_CFLAGS': [
-                '-w'
-              ],
-            },
-            'msvs_settings': {
-              'VCCLCompilerTool': {
-                'AdditionalOptions': [
-                  '/wd4996',
-                  '/wd4018',
-                  '/wd4267',
-                ],
-              },
-            },
-            'sources': [
-              '../third_party/externals/giflib/dgif_lib.c',
-              '../third_party/externals/giflib/gifalloc.c',
-              '../third_party/externals/giflib/gif_err.c',
-            ],
-            'conditions' : [
-              [ 'skia_os == "win"', {
-                  'include_dirs': [
-                    # Used to include a dummy unistd.h file for windows
-                    '../third_party/giflib',
-                  ],
-                },
-              ],
-            ],
-          }, { # skia_android_framework
-            'type': 'none',
-            'direct_dependent_settings': {
-              'libraries' : [
-                'libgif.a',
-              ],
-              'include_dirs': [
-                'external/giflib',
-              ]
-            }
-          }
-        ]
-      ]
-    }
-  ]
-}
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 7b1636e02b..1b9920e314 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -13,7 +13,6 @@
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
-        'giflib.gyp:giflib',
         'libjpeg-turbo-selector.gyp:libjpeg-turbo-selector',
         'etc1.gyp:libetc1',
         'ktx.gyp:libSkKTX',
@@ -32,10 +31,8 @@
       ],
       'sources': [
         '../include/images/SkForceLinking.h',
-        '../include/images/SkMovie.h',
 
         '../src/images/SkForceLinking.cpp',
-        '../src/images/SkMovie_FactoryDefault.cpp',
 
         # If encoders are added/removed to/from (all/individual)
         # platform(s), be sure to update SkForceLinking.cpp
@@ -49,20 +46,12 @@
         '../src/images/SkImageEncoder.cpp',
         '../src/images/SkImageEncoder_Factory.cpp',
         '../src/images/SkJPEGWriteUtility.cpp',
-        '../src/images/SkMovie.cpp',
-        '../src/images/SkGIFMovie.cpp',
 
         '../src/ports/SkImageEncoder_CG.cpp',
         '../src/ports/SkImageEncoder_WIC.cpp',
       ],
       'conditions': [
         [ 'skia_os == "win"', {
-          'sources!': [
-            '../src/images/SkGIFMovie.cpp',
-          ],
-          'dependencies!': [
-            'giflib.gyp:giflib'
-          ],
           'link_settings': {
             'libraries': [
               '-lwindowscodecs.lib',
@@ -74,9 +63,6 @@
           ],
         }],
         [ 'skia_os in ["mac", "ios"]', {
-          'sources!': [
-            '../src/images/SkGIFMovie.cpp',
-          ],
         },{ #else if skia_os != mac
           'sources!': [
             '../src/ports/SkImageEncoder_CG.cpp',
-- 
cgit v1.2.3