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

This commit was generated by merge_from_chromium.py.

Change-Id: I55909d3dce204a8700c4251abc0102bbd6f82f7a

3 files changed, 20 insertions, 11 deletions

diff --git a/common_conditions.gypi b/common_conditions.gypi
index 71dca26..175b8b0 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -91,6 +91,8 @@
               },
             },
           },
+        },
+        'conditions' : [
           # Gyp's ninja generator depends on these specially named
           # configurations to build 64-bit on Windows.
           # See http://skbug.com/2348
@@ -98,17 +100,22 @@
           # We handle the 64- vs 32-bit variations elsewhere, so I think it's
           # OK for us to just make these inherit non-archwidth-specific
           # configurations without modification.
-          'Debug_x64': {
-            'inherit_from': ['Debug'],
-          },
-          'Release_x64': {
-            'inherit_from': ['Release'],
-          },
-          'Release_Developer_x64': {
-            'inherit_from': ['Release_Developer'],
-          },
-        },
-        'conditions' : [
+          #
+          # See http://skbug.com/2442 : These targets cause problems in the
+          # MSVS build, so only include them if gyp is generating a ninja build.
+          [ '"ninja" in "<!(echo %GYP_GENERATORS%)"', {
+            'configurations': {
+              'Debug_x64': {
+                'inherit_from': ['Debug'],
+              },
+              'Release_x64': {
+                'inherit_from': ['Release'],
+              },
+              'Release_Developer_x64': {
+                'inherit_from': ['Release_Developer'],
+              },
+            },
+          }],
           [ 'skia_arch_width == 64', {
             'msvs_configuration_platform': 'x64',
           }],
diff --git a/gmslides.gypi b/gmslides.gypi
index e381743..67a9adb 100644
--- a/gmslides.gypi
+++ b/gmslides.gypi
@@ -80,6 +80,7 @@
     '../gm/getpostextpath.cpp',
     '../gm/giantbitmap.cpp',
     '../gm/gradients.cpp',
+    '../gm/gradients_2pt_conical.cpp',
     '../gm/gradients_no_texture.cpp',
     '../gm/gradientDirtyLaundry.cpp',
     '../gm/gradient_matrix.cpp',
diff --git a/tests.gypi b/tests.gypi
index e6c6bb0..f27b144 100644
--- a/tests.gypi
+++ b/tests.gypi
@@ -34,6 +34,7 @@
     '../tests/ARGBImageEncoderTest.cpp',
     '../tests/AndroidPaintTest.cpp',
     '../tests/AnnotationTest.cpp',
+    '../tests/AsADashTest.cpp',
     '../tests/AtomicTest.cpp',
     '../tests/BBoxHierarchyTest.cpp',
     '../tests/BitSetTest.cpp',