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

This commit was generated by merge_from_chromium.py.

Change-Id: If6846e005da93ea649ffe23122e2a934420eeadc

4 files changed, 16 insertions, 6 deletions

diff --git a/common_conditions.gypi b/common_conditions.gypi
index f312df9..71dca26 100644
--- a/common_conditions.gypi
+++ b/common_conditions.gypi
@@ -300,6 +300,8 @@
         'SK_SUPPORT_LEGACY_DERIVED_PICTURE_CLASSES',
         'SK_SUPPORT_LEGACY_PICTURE_HEADERS',
         'SK_SUPPORT_LEGACY_BLURDRAWLOOPERCONSTRUCTORS',
+        # Needed until we fix skbug.com/2440.
+        'SK_SUPPORT_LEGACY_CLIPTOLAYERFLAG',
       ],
     }],
 
diff --git a/record.gyp b/record.gyp
index 31decb6..0bfd83e 100644
--- a/record.gyp
+++ b/record.gyp
@@ -3,6 +3,7 @@
     'targets': [{
         'target_name': 'record',
         'type': 'static_library',
+        'includes': [ 'record.gypi' ],
         'include_dirs': [
             '../include/config',
             '../include/core',
@@ -13,11 +14,5 @@
                 '../include/record',  # Public headers.
             ],
         },
-        'sources': [
-            '../src/record/SkRecordCulling.cpp',
-            '../src/record/SkRecordDraw.cpp',
-            '../src/record/SkRecorder.cpp',
-            '../src/record/SkRecording.cpp',
-        ],
     }]
 }
diff --git a/record.gypi b/record.gypi
new file mode 100644
index 0000000..adfd462
--- /dev/null
+++ b/record.gypi
@@ -0,0 +1,12 @@
+# Source list for SkRecord
+# The parent gyp/gypi file must define
+#       'skia_src_path'     e.g. skia/trunk/src
+# The Skia build defines this in common_variables.gypi.
+{
+    'sources': [
+        '<(skia_src_path)/record/SkRecordDraw.cpp',
+        '<(skia_src_path)/record/SkRecordOpts.cpp',
+        '<(skia_src_path)/record/SkRecorder.cpp',
+        '<(skia_src_path)/record/SkRecording.cpp',
+    ]
+}
diff --git a/tests.gypi b/tests.gypi
index 5c3ce94..e6c6bb0 100644
--- a/tests.gypi
+++ b/tests.gypi
@@ -127,6 +127,7 @@
     '../tests/PathTest.cpp',
     '../tests/PathUtilsTest.cpp',
     '../tests/PictureTest.cpp',
+    '../tests/PictureShaderTest.cpp',
     '../tests/PictureUtilsTest.cpp',
     '../tests/PixelRefTest.cpp',
     '../tests/PointTest.cpp',