Roll external/skia c244c2fbb..60c0c8fcd (5 commits)
https://skia.googlesource.com/skia.git/+log/c244c2fbb..60c0c8fcd
2018-11-09 mtklein@google.com remove unused typedef
2018-11-09 halcanary@google.com SkQP: script: fix non-existant build path
2018-11-09 reed@google.com remove guards for hinting in google3
2018-11-09 nathanrogers@google.com Fix another typo in SkSize comments
2018-11-09 nigeltao@google.com Merge SkFooAdapterCodec impls into one impl
The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-master-autoroll
Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md
If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.
Test: Presubmit checks will test this change.
Change-Id: If0bafd657dcdb57c787368f70e282dc2ca922577
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
diff --git a/Android.bp b/Android.bp
index 5caae3b..c90e1b8 100644
--- a/Android.bp
+++ b/Android.bp
@@ -91,6 +91,7 @@
"src/c/sk_paint.cpp",
"src/c/sk_surface.cpp",
"src/codec/SkAndroidCodec.cpp",
+ "src/codec/SkAndroidCodecAdapter.cpp",
"src/codec/SkBmpBaseCodec.cpp",
"src/codec/SkBmpCodec.cpp",
"src/codec/SkBmpMaskCodec.cpp",
@@ -109,14 +110,12 @@
"src/codec/SkMaskSwizzler.cpp",
"src/codec/SkMasks.cpp",
"src/codec/SkPngCodec.cpp",
- "src/codec/SkRawAdapterCodec.cpp",
"src/codec/SkRawCodec.cpp",
"src/codec/SkSampledCodec.cpp",
"src/codec/SkSampler.cpp",
"src/codec/SkStreamBuffer.cpp",
"src/codec/SkSwizzler.cpp",
"src/codec/SkWbmpCodec.cpp",
- "src/codec/SkWebpAdapterCodec.cpp",
"src/codec/SkWebpCodec.cpp",
"src/core/SkAAClip.cpp",
"src/core/SkATrace.cpp",