commit 612a65dd8b27761f2f9e4e68b3a861beb12ea2ed
author Nigel Tao <nigeltao@google.com> Fri Nov 09 10:10:31 2018 +1100
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Nov 09 14:48:44 2018 +0000
tree ff4c4303527452129dcbea5ea1feff7f3df61962
parent c244c2fbbbf85c58a43c977c7c28109a5cdb9cd9

Merge SkFooAdapterCodec impls into one impl

Bug: skia:
Change-Id: I5071e45979c1bbfc56ad994367a039390e2519f9
Reviewed-on: https://skia-review.googlesource.com/c/169920
Reviewed-by: Leon Scroggins <scroggo@google.com>
Commit-Queue: Leon Scroggins <scroggo@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index e58a6e1..c889c8b 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -721,7 +721,6 @@
   configs_to_remove = [ "//gn:no_exceptions" ]
 
   sources = [
-    "src/codec/SkRawAdapterCodec.cpp",
     "src/codec/SkRawCodec.cpp",
   ]
 }
@@ -762,7 +761,6 @@
     "//third_party/libwebp",
   ]
   sources = [
-    "src/codec/SkWebpAdapterCodec.cpp",
     "src/codec/SkWebpCodec.cpp",
     "src/images/SkWebpEncoder.cpp",
   ]
@@ -879,6 +877,7 @@
     "src/android/SkBitmapRegionCodec.cpp",
     "src/android/SkBitmapRegionDecoder.cpp",
     "src/codec/SkAndroidCodec.cpp",
+    "src/codec/SkAndroidCodecAdapter.cpp",
     "src/codec/SkBmpBaseCodec.cpp",
     "src/codec/SkBmpCodec.cpp",
     "src/codec/SkBmpMaskCodec.cpp",