commit dff12291299cb6eaa88a82cc096c03d348dfdfad
author Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Thu Jan 26 17:56:16 2017 +0000
committer Skia_Android Canary Bot <31977622648@project.gserviceaccount.com> Thu Jan 26 17:56:16 2017 +0000
tree 35950aa698a191bc91ffdcccecc8b22214e8ee6d
parent 3e1c32c54cf0df3438c78f03aed7969b101ea8fe
parent 0c0da2b0e21e37c33ae577e0af3e921df320ce5b

Merge latest Skia into master (3 commits)

https://skia.googlesource.com/skia.git/+log/7215283..0c0da2b

Test: Presubmit checks will test this change.
Change-Id: Ibb132f5c3ec1c216c63e1bc904c93efc8618c330

Android.bp

diff --git a/Android.bp b/Android.bp
index 36cc0a0..2506aaf 100644
--- a/Android.bp
+++ b/Android.bp
@@ -324,7 +324,6 @@
         "src/effects/SkDropShadowImageFilter.cpp",
         "src/effects/SkEmbossMask.cpp",
         "src/effects/SkEmbossMaskFilter.cpp",
-        "src/effects/SkGammaColorFilter.cpp",
         "src/effects/SkGaussianEdgeShader.cpp",
         "src/effects/SkImageSource.cpp",
         "src/effects/SkLayerDrawLooper.cpp",
@@ -455,12 +454,12 @@
         "src/gpu/effects/GrDisableColorXP.cpp",
         "src/gpu/effects/GrDistanceFieldGeoProc.cpp",
         "src/gpu/effects/GrDitherEffect.cpp",
-        "src/gpu/effects/GrGammaEffect.cpp",
         "src/gpu/effects/GrGaussianConvolutionFragmentProcessor.cpp",
         "src/gpu/effects/GrMatrixConvolutionEffect.cpp",
         "src/gpu/effects/GrOvalEffect.cpp",
         "src/gpu/effects/GrPorterDuffXferProcessor.cpp",
         "src/gpu/effects/GrRRectEffect.cpp",
+        "src/gpu/effects/GrSRGBEffect.cpp",
         "src/gpu/effects/GrShadowGeoProc.cpp",
         "src/gpu/effects/GrShadowTessellator.cpp",
         "src/gpu/effects/GrSimpleTextureEffect.cpp",