commit ce4693fb192e64b9034c5868e232fbf96aba31f3
author Hal Canary <halcanary@google.com> Wed Nov 20 21:43:54 2019 +0000
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Nov 20 21:44:04 2019 +0000
tree 24531f2c5ed733d683072f1b33643b8b505ebbb5
parent 7cd0bfe769d6a8429748bb9846b7a1a8368e62c3

Revert "public.bzl: update to replace Gif with Wuffs"

This reverts commit 3e0aa84a556e637d090e83587a2a3a1546921fbc.

Reason for revert: try to fix g3 roll

Original change's description:
> public.bzl: update to replace Gif with Wuffs
> 
> Also, do away with complex exclude rules.  Explicit is often better.
> 
> Change-Id: I1d945c237a179f6db2552742fdf9e067d6d9eaf9
> Reviewed-on: https://skia-review.googlesource.com/c/skia/+/254578
> Commit-Queue: Hal Canary <halcanary@google.com>
> Commit-Queue: Leon Scroggins <scroggo@google.com>
> Reviewed-by: Leon Scroggins <scroggo@google.com>
> Auto-Submit: Hal Canary <halcanary@google.com>

TBR=halcanary@google.com,scroggo@google.com

Change-Id: I7909840ef9d206718c3ac0483b555f5d2306a04f
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/255581
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>

public.bzl

diff --git a/public.bzl b/public.bzl
index bf34735..d8a1167 100644
--- a/public.bzl
+++ b/public.bzl
@@ -264,41 +264,18 @@
     ],
 )
 
-# Provides SkCodec support for Jpeg(libjpeg), Gif(Wuffs), Bmp, Wbmp.
-LIMITED_CODEC_SRCS = [
-    "src/codec/SkAndroidCodec.cpp",
-    "src/codec/SkAndroidCodecAdapter.cpp",
-    "src/codec/SkBmpBaseCodec.cpp",
-    "src/codec/SkBmpCodec.cpp",
-    "src/codec/SkBmpMaskCodec.cpp",
-    "src/codec/SkBmpRLECodec.cpp",
-    "src/codec/SkBmpStandardCodec.cpp",
-    "src/codec/SkCodec.cpp",
-    "src/codec/SkCodecImageGenerator.cpp",
-    "src/codec/SkColorTable.cpp",
-    "src/codec/SkEncodedInfo.cpp",
-    "src/codec/SkHeifCodec.cpp",
-    "src/codec/SkJpegCodec.cpp",
-    "src/codec/SkJpegDecoderMgr.cpp",
-    "src/codec/SkJpegUtility.cpp",
-    "src/codec/SkMaskSwizzler.cpp",
-    "src/codec/SkMasks.cpp",
-    "src/codec/SkParseEncodedOrigin.cpp",
-    "src/codec/SkSampledCodec.cpp",
-    "src/codec/SkSampler.cpp",
-    "src/codec/SkStreamBuffer.cpp",
-    "src/codec/SkSwizzler.cpp",
-    "src/codec/SkWbmpCodec.cpp",
-    "src/codec/SkWuffsCodec.cpp",
-]
+def codec_srcs(limited):
+    """Sources for the codecs. Excludes Raw, and Ico, Webp, and Png if limited."""
 
-# Provides SkCodec support for Jpeg(libjpeg), Gif(Wuffs), Bmp, Wbmp,
-# Ico, Png(libpng), and Webp(libwebp).
-FULL_CODEC_SRCS = LIMITED_CODEC_SRCS + [
-    "src/codec/SkIcoCodec.cpp",
-    "src/codec/SkPngCodec.cpp",
-    "src/codec/SkWebpCodec.cpp",
-]
+    # TODO: Enable wuffs in Google3
+    exclude = ["src/codec/SkWuffsCodec.cpp", "src/codec/*Raw*.cpp"]
+    if limited:
+        exclude += [
+            "src/codec/*Ico*.cpp",
+            "src/codec/*Webp*.cpp",
+            "src/codec/*Png*",
+        ]
+    return native.glob(["src/codec/*.cpp", "third_party/gif/*.cpp"], exclude = exclude)
 
 GL_SRCS_UNIX = struct(
     include = [