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

2 files changed, 60 insertions, 56 deletions

diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi
index 4f2375972f..6507ee45f7 100644
--- a/platform_tools/android/gyp/dependencies.gypi
+++ b/platform_tools/android/gyp/dependencies.gypi
@@ -1,8 +1,3 @@
-# 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 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.
@@ -60,11 +55,33 @@
       }
     },
     {
+      'target_name': 'gif',
+      'type': 'static_library',
+      'sources': [
+        '../third_party/externals/gif/dgif_lib.c',
+        '../third_party/externals/gif/gifalloc.c',
+        '../third_party/externals/gif/gif_err.c',
+      ],
+      'include_dirs': [
+        '../third_party/externals/gif',
+      ],
+      'cflags': [
+        '-w',
+        '-DHAVE_CONFIG_H',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../third_party/externals/gif',
+        ],
+      }
+    },
+    {
       'target_name': 'png',
       'type': 'static_library',
       'sources': [
         '../third_party/externals/png/png.c',
         '../third_party/externals/png/pngerror.c',
+        '../third_party/externals/png/pnggccrd.c',
         '../third_party/externals/png/pngget.c',
         '../third_party/externals/png/pngmem.c',
         '../third_party/externals/png/pngpread.c',
@@ -74,25 +91,12 @@
         '../third_party/externals/png/pngrutil.c',
         '../third_party/externals/png/pngset.c',
         '../third_party/externals/png/pngtrans.c',
+        '../third_party/externals/png/pngvcrd.c',
         '../third_party/externals/png/pngwio.c',
         '../third_party/externals/png/pngwrite.c',
         '../third_party/externals/png/pngwtran.c',
         '../third_party/externals/png/pngwutil.c',
       ],
-      'conditions': [
-        [ 'arm_neon == 1',
-          {
-            'sources' : [
-              '../third_party/externals/png/arm/arm_init.c',
-              '../third_party/externals/png/arm/filter_neon.S',
-              '../third_party/externals/png/arm/filter_neon_intrinsics.c',
-            ],
-            'defines' : [
-              'PNG_ARM_NEON_OPT=2',
-            ],
-          },
-        ],
-      ],
       'include_dirs': [
         '../third_party/externals/png',
       ],
@@ -156,46 +160,11 @@
         '../third_party/externals/jpeg/jidctfst.c',
         '../third_party/externals/jpeg/jidctint.c',
         '../third_party/externals/jpeg/jidctred.c',
-        '../third_party/externals/jpeg/jmem-android.c',
-        '../third_party/externals/jpeg/jmemmgr.c',
         '../third_party/externals/jpeg/jquant1.c',
         '../third_party/externals/jpeg/jquant2.c',
         '../third_party/externals/jpeg/jutils.c',
-      ],
-      'conditions': [
-        [ 'arm_neon == 1',
-          {
-            'sources' : [
-              '../third_party/externals/jpeg/armv6_idct.S',
-              '../third_party/externals/jpeg/jsimd_arm_neon.S',
-              '../third_party/externals/jpeg/jsimd_neon.c',
-            ],
-            'defines' : [
-              'NV_ARM_NEON',
-            ],
-          },
-        ],
-        [ 'skia_arch_type == "mips" and mips_dsp == 2',
-          {
-            'sources' : [
-              '../third_party/externals/jpeg/mips_jidctfst.c',
-              '../third_party/externals/jpeg/mips_idct_le.S',
-            ],
-            'defines' : [
-              'ANDROID_MIPS_IDCT',
-            ],
-          },
-        ],
-        [ '"x86" in skia_arch_type',
-          {
-            'sources' : [
-              '../third_party/externals/jpeg/jidctintelsse.c',
-            ],
-            'defines' : [
-              'ANDROID_INTELSSE2_IDCT',
-            ],
-          },
-        ],
+        '../third_party/externals/jpeg/jmemmgr.c',
+        '../third_party/externals/jpeg/jmem-android.c', # ashmem is also available
       ],
       'include_dirs': [
         '../third_party/externals/jpeg',
diff --git a/platform_tools/chromeos/gyp/dependencies.gypi b/platform_tools/chromeos/gyp/dependencies.gypi
new file mode 100644
index 0000000000..38e3c5337f
--- /dev/null
+++ b/platform_tools/chromeos/gyp/dependencies.gypi
@@ -0,0 +1,35 @@
+# 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.
+
+{
+  'variables': {
+    'skia_warnings_as_errors': 0,
+  },
+  'targets': [
+    {
+      'target_name': 'gif',
+      'type': 'static_library',
+      'sources': [
+        '../third_party/externals/gif/dgif_lib.c',
+        '../third_party/externals/gif/gifalloc.c',
+        '../third_party/externals/gif/gif_err.c',
+      ],
+      'include_dirs': [
+        '../third_party/externals/gif',
+      ],
+      'cflags': [
+        '-Wno-format',
+        '-DHAVE_CONFIG_H',
+      ],
+      'cflags!': [
+        '-Wall',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [
+          '../third_party/externals/gif',
+        ],
+      }
+    },
+  ]
+}