Merge from Chromium at DEPS revision 260540

This commit was generated by merge_to_master.py.

Change-Id: I10b8e4931992bb84eb4da800a337bbd0a52f6588
diff --git a/skia/skia_library.target.linux-x86_64.mk b/skia/skia_library.target.linux-x86_64.mk
index d475696..de251c8 100644
--- a/skia/skia_library.target.linux-x86_64.mk
+++ b/skia/skia_library.target.linux-x86_64.mk
@@ -360,6 +360,7 @@
 	third_party/skia/src/gpu/effects/GrBicubicEffect.cpp \
 	third_party/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp \
 	third_party/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp \
+	third_party/skia/src/gpu/effects/GrOvalEffect.cpp \
 	third_party/skia/src/gpu/effects/GrRRectEffect.cpp \
 	third_party/skia/src/gpu/effects/GrSimpleTextureEffect.cpp \
 	third_party/skia/src/gpu/effects/GrSingleTextureEffect.cpp \