Revert of WIP: Added support for giflib, updated jpeg and png (patchset #8 id:260001 of https://codereview.chromium.org/1038863003/)

Reason for revert:
Trying out revert to see if it fixes Android bots.

Original issue's description:
> WIP: Added support for giflib, updated jpeg and png
>
> BUG=skia:3257
>
> Committed: https://skia.googlesource.com/skia/+/255dcd11992ebe74eb54202c48cf5394d33a8ce6

TBR=djsollen@google.com,scroggo@google.com,msarett@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3257

Review URL: https://codereview.chromium.org/1048713003

5 files changed, 48 insertions, 21 deletions

diff --git a/gyp/android_deps.gyp b/gyp/android_deps.gyp
index ceecb062bc..2188150532 100644
--- a/gyp/android_deps.gyp
+++ b/gyp/android_deps.gyp
@@ -2,7 +2,6 @@
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
-
 # This GYP file stores the dependencies necessary to build Skia on the Android
 # platform. The OS doesn't provide many stable libraries as part of the
 # distribution so we have to build a few of them ourselves.
@@ -40,6 +39,18 @@
             },
           },
           {
+            'target_name': 'gif',
+            'type': 'none',
+            'direct_dependent_settings': {
+              'libraries' : [
+                'libgif.a',
+              ],
+              'include_dirs': [
+                'external/giflib',
+              ],
+            },
+          },
+          {
             'target_name': 'png',
             'type': 'none',
             'direct_dependent_settings': {
diff --git a/gyp/chromeos_deps.gyp b/gyp/chromeos_deps.gyp
new file mode 100644
index 0000000000..63ab084b9c
--- /dev/null
+++ b/gyp/chromeos_deps.gyp
@@ -0,0 +1,13 @@
+# Copyright 2015 Google Inc.
+#
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+# This GYP file stores the dependencies necessary to build Skia on the Chrome OS
+# platform. The OS doesn't provide many stable libraries as part of the
+# distribution so we have to build a few of them ourselves.
+
+{
+  'includes': [
+    '../platform_tools/chromeos/gyp/dependencies.gypi',
+  ],
+}
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 1b9cf331e8..1031b52a1d 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -118,6 +118,13 @@
         ],
       ],
 
+      # skia_giflib_static - on OS variants that normally would link giflib
+      #     with '-lgif' and include the headers from '/usr/include/gif_lib.h',
+      #     don't do that; instead compile and staticlly link the version of
+      #     giflib in third_party/externals/giflib.
+      'skia_giflib_static%': '0',
+
+
       # skia_no_fontconfig - On POSIX systems that would normally use the
       #     SkFontHost_fontconfig interface; use the SkFontHost_linux
       #     version instead.
@@ -199,6 +206,7 @@
     'os_posix%': '<(os_posix)',
 
     'skia_freetype_static%': '<(skia_freetype_static)',
+    'skia_giflib_static%': '<(skia_giflib_static)',
     'skia_no_fontconfig%': '<(skia_no_fontconfig)',
     'skia_sanitizer%': '<(skia_sanitizer)',
     'skia_scalar%': '<(skia_scalar)',
diff --git a/gyp/giflib.gyp b/gyp/giflib.gyp
index 9263835d2e..3a2c2153bf 100644
--- a/gyp/giflib.gyp
+++ b/gyp/giflib.gyp
@@ -11,7 +11,7 @@
     {
       'target_name': 'giflib',
       'conditions': [
-        [ 'skia_android_framework == 0',
+        [ 'skia_giflib_static',
           {
             'type': 'static_library',
             'defines': [
@@ -35,18 +35,17 @@
               '../third_party/externals/giflib/gifalloc.c',
               '../third_party/externals/giflib/gif_err.c',
             ],
-          }, { # skia_android_framework
+          }, {  # not skia_giflib_static
             'type': 'none',
             'direct_dependent_settings': {
-              'libraries' : [
-                'libgif.a',
-              ],
-              'include_dirs': [
-                'external/giflib',
-              ]
-            }
+              'link_settings': {
+                'libraries': [
+                  '-lgif',
+                ],
+              },
+            },
           }
-        ]
+        ],
       ]
     }
   ]
diff --git a/gyp/images.gyp b/gyp/images.gyp
index 34cc8a8fa8..4cce08e7a1 100644
--- a/gyp/images.gyp
+++ b/gyp/images.gyp
@@ -2,7 +2,6 @@
 #
 # 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': [
@@ -13,7 +12,6 @@
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
-        'giflib.gyp:giflib',
         'libjpeg.gyp:*',
         'etc1.gyp:libetc1',
         'ktx.gyp:libSkKTX',
@@ -89,9 +87,6 @@
             '../src/images/SkImageDecoder_libpng.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
-          'dependencies!': [
-            'giflib.gyp:giflib'
-          ],
           'link_settings': {
             'libraries': [
               '-lwindowscodecs.lib',
@@ -117,11 +112,13 @@
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris"]', {
           'export_dependent_settings': [
             'libpng.gyp:libpng',
+            'giflib.gyp:giflib'
           ],
           'dependencies': [
             'libpng.gyp:libpng',
+            'giflib.gyp:giflib'
           ],
-          # end libpng stuff
+          # end libpng/libgif stuff
         }],
         # FIXME: NaCl should be just like linux, etc, above, but it currently is separated out
         # to remove gif. Once gif is supported by naclports, this can be merged into the above
@@ -131,15 +128,13 @@
             '../src/images/SkImageDecoder_libgif.cpp',
             '../src/images/SkMovie_gif.cpp',
           ],
-          'dependencies!': [
-            'giflib.gyp:giflib'
-          ],
         }],
         [ 'skia_os == "android"', {
           'include_dirs': [
              '../src/utils',
           ],
           'dependencies': [
+             'android_deps.gyp:gif',
              'android_deps.gyp:png',
           ],
           'conditions': [
@@ -161,7 +156,8 @@
         }],
         [ 'skia_os == "chromeos"', {
           'dependencies': [
-            'libpng.gyp:libpng',
+             'chromeos_deps.gyp:gif',
+             'libpng.gyp:libpng',
           ],
         }],
         [ 'skia_os == "ios"', {