Merge from Chromium at DEPS revision 278856
This commit was generated by merge_to_master.py.
Change-Id: If3807744d3e5d3ee84b897bd2d099a2b7ed2e7a3
diff --git a/skia/skia_library.target.linux-x86_64.mk b/skia/skia_library.target.linux-x86_64.mk
index db0541b..85c2386 100644
--- a/skia/skia_library.target.linux-x86_64.mk
+++ b/skia/skia_library.target.linux-x86_64.mk
@@ -325,6 +325,7 @@
third_party/skia/src/gpu/GrBitmapTextContext.cpp \
third_party/skia/src/gpu/GrBlend.cpp \
third_party/skia/src/gpu/GrBufferAllocPool.cpp \
+ third_party/skia/src/gpu/GrCacheable.cpp \
third_party/skia/src/gpu/GrCacheID.cpp \
third_party/skia/src/gpu/GrClipData.cpp \
third_party/skia/src/gpu/GrContext.cpp \
@@ -372,6 +373,7 @@
third_party/skia/src/gpu/effects/GrCustomCoordsTextureEffect.cpp \
third_party/skia/src/gpu/effects/GrDashingEffect.cpp \
third_party/skia/src/gpu/effects/GrDistanceFieldTextureEffect.cpp \
+ third_party/skia/src/gpu/effects/GrDitherEffect.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 \
@@ -474,6 +476,7 @@
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DSK_ENABLE_INST_COUNT=0' \
'-DSK_SUPPORT_GPU=1' \
@@ -488,6 +491,7 @@
'-DSK_SUPPORT_LEGACY_N32_NAME' \
'-DSK_SUPPORT_LEGACY_SETCONFIG' \
'-DSK_IGNORE_ETC1_SUPPORT' \
+ '-DSK_IGNORE_GPU_DITHER' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \
@@ -622,6 +626,7 @@
'-DDATA_REDUCTION_DEV_HOST="http://proxy-dev.googlezip.net:80/"' \
'-DSPDY_PROXY_AUTH_ORIGIN="https://proxy.googlezip.net:443/"' \
'-DDATA_REDUCTION_PROXY_PROBE_URL="http://check.googlezip.net/connect"' \
+ '-DDATA_REDUCTION_PROXY_WARMUP_URL="http://www.gstatic.com/generate_204"' \
'-DVIDEO_HOLE=1' \
'-DSK_ENABLE_INST_COUNT=0' \
'-DSK_SUPPORT_GPU=1' \
@@ -636,6 +641,7 @@
'-DSK_SUPPORT_LEGACY_N32_NAME' \
'-DSK_SUPPORT_LEGACY_SETCONFIG' \
'-DSK_IGNORE_ETC1_SUPPORT' \
+ '-DSK_IGNORE_GPU_DITHER' \
'-DSK_SUPPORT_LEGACY_GETTOTALCLIP' \
'-DSK_BUILD_FOR_ANDROID' \
'-DSK_ALLOW_STATIC_GLOBAL_INITIALIZERS=0' \