commit 9dad6c99c99f1b8b47564d5f2d023a51897c55eb
author android-autoroll <android-autoroll@skia-corp.google.com.iam.gserviceaccount.com> Fri Mar 05 13:45:06 2021 +0000
committer android-autoroll <android-autoroll@skia-corp.google.com.iam.gserviceaccount.com> Fri Mar 05 13:45:06 2021 +0000
tree 76fb61d97a455dab0889555cc7e6e85917155168
parent 98c8456882917aaacb0418f487faee160a8133a1
parent 48bfa488091a64ca8cdba090635a9d7871245378

Roll Skia from 994a571fc79a to 48bfa488091a (3 revisions)

https://skia.googlesource.com/skia.git/+log/994a571fc79a..48bfa488091a

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://skia-autoroll.corp.goog/r/android-master-autoroll
Please CC stani@google.com on the revert to ensure that a human
is aware of the problem.

To report a problem with the AutoRoller itself, please file a bug:
https://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/master/autoroll/README.md

Test: Presubmit checks will test this change.
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
Change-Id: Ia9473231797408abf0e36a01baac4398a71d78d8

Android.bp

diff --git a/Android.bp b/Android.bp
index b733c6c..4d76351 100644
--- a/Android.bp
+++ b/Android.bp
@@ -853,7 +853,7 @@
           "src/gpu/text/GrAtlasManager.cpp",
           "src/gpu/text/GrDistanceFieldAdjustTable.cpp",
           "src/gpu/text/GrSDFMaskFilter.cpp",
-          "src/gpu/text/GrSDFTControl.cpp",
+          "src/gpu/text/GrSDFTOptions.cpp",
           "src/gpu/text/GrStrikeCache.cpp",
           "src/gpu/text/GrTextBlob.cpp",
           "src/gpu/text/GrTextBlobCache.cpp",