Merge third_party/skia/gyp from https://chromium.googlesource.com/external/skia/gyp.git at ad64fe80988d6bd5b1467ecfab1341bc71aab706

This commit was generated by merge_from_chromium.py.

Change-Id: I177ddac7f30e748c08cd13acb57fc7a8c26790ab

3 files changed, 4 insertions, 2 deletions

diff --git a/dm.gyp b/dm.gyp
index 8bb8ddf..4cfcdc6 100644
--- a/dm.gyp
+++ b/dm.gyp
@@ -33,6 +33,7 @@
             '../dm/DMExpectationsTask.cpp',
             '../dm/DMGpuGMTask.cpp',
             '../dm/DMPipeTask.cpp',
+            '../dm/DMQuiltTask.cpp',
             '../dm/DMRecordTask.cpp',
             '../dm/DMReplayTask.cpp',
             '../dm/DMReporter.cpp',
@@ -40,7 +41,6 @@
             '../dm/DMTask.cpp',
             '../dm/DMTaskRunner.cpp',
             '../dm/DMTestTask.cpp',
-            '../dm/DMTileGridTask.cpp',
             '../dm/DMUtil.cpp',
             '../dm/DMWriteTask.cpp',
             '../gm/gm.cpp',
diff --git a/gpu.gypi b/gpu.gypi
index 5eb9a79..efeeb2d 100644
--- a/gpu.gypi
+++ b/gpu.gypi
@@ -164,6 +164,8 @@
       '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.cpp',
       '<(skia_src_path)/gpu/effects/GrTextureStripAtlas.h',
 
+      '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.cpp',
+      '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.h',
       '<(skia_src_path)/gpu/gl/GrGLBufferImpl.cpp',
       '<(skia_src_path)/gpu/gl/GrGLBufferImpl.h',
       '<(skia_src_path)/gpu/gl/GrGLCaps.cpp',
diff --git a/tests.gypi b/tests.gypi
index 982d58d..afe256c 100644
--- a/tests.gypi
+++ b/tests.gypi
@@ -140,8 +140,8 @@
     '../tests/ReadPixelsTest.cpp',
     '../tests/ReadWriteAlphaTest.cpp',
     '../tests/Reader32Test.cpp',
-    '../tests/RecordCullingTest.cpp',
     '../tests/RecordDrawTest.cpp',
+    '../tests/RecordOptsTest.cpp',
     '../tests/RecordTest.cpp',
     '../tests/RecorderTest.cpp',
     '../tests/RecordingTest.cpp',