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

This commit was generated by merge_from_chromium.py.

Change-Id: I929ff5f206c19a2ea1548d012704c8dac3b1265e

6 files changed, 16 insertions, 2 deletions

diff --git a/common_variables.gypi b/common_variables.gypi
index 4b80af1..74e596c 100644
--- a/common_variables.gypi
+++ b/common_variables.gypi
@@ -87,6 +87,7 @@
       'skia_resource_cache_mb_limit%': 0,
       'skia_resource_cache_count_limit%': 0,
       'skia_angle%': 0,
+      'skia_chrome_utils%': 1,
       'skia_directwrite%': 0,
       'skia_gpu%': 1,
       'skia_osx_sdkroot%': '',
@@ -147,6 +148,7 @@
     'skia_angle%': '<(skia_angle)',
     'skia_arch_width%': '<(skia_arch_width)',
     'skia_arch_type%': '<(skia_arch_type)',
+    'skia_chrome_utils%': '<(skia_chrome_utils)',
     'skia_directwrite%': '<(skia_directwrite)',
     'skia_gpu%': '<(skia_gpu)',
     'skia_win_exceptions%': 0,
diff --git a/dm.gyp b/dm.gyp
index 8fa59c5..e56cf16 100644
--- a/dm.gyp
+++ b/dm.gyp
@@ -20,8 +20,8 @@
         'includes': [ 'gmslides.gypi' ],
         'sources': [
             '../dm/DM.cpp',
-            '../dm/DMChecksumTask.cpp',
             '../dm/DMCpuTask.cpp',
+            '../dm/DMExpectationsTask.cpp',
             '../dm/DMGpuTask.cpp',
             '../dm/DMPipeTask.cpp',
             '../dm/DMReplayTask.cpp',
diff --git a/gpu.gyp b/gpu.gyp
index 55191ae..fc6c28b 100644
--- a/gpu.gyp
+++ b/gpu.gyp
@@ -133,6 +133,15 @@
             'GR_ANDROID_PATH_RENDERING=1',
           ],
         }],
+        [ 'skia_chrome_utils', {
+          'sources': [
+            '../experimental/ChromeUtils/SkBorder.cpp',
+            '../experimental/ChromeUtils/SkBorder.h',
+          ],
+          'defines': [
+            'GR_CHROME_UTILS=1',
+          ],
+        }],
         [ 'skia_distancefield_fonts', {
           'sources': [
             '<(skia_include_path)/gpu/GrDistanceFieldTextContext.h',
diff --git a/opts.gyp b/opts.gyp
index d260220..bd072cb 100644
--- a/opts.gyp
+++ b/opts.gyp
@@ -97,7 +97,7 @@
             }],
           ],
         }],
-        [ '(skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', {
+        [ '(skia_arch_type == "mips") or (skia_arch_type == "arm" and arm_version < 7) or (skia_os == "ios")', {
           'sources': [
             '../src/opts/SkBitmapProcState_opts_none.cpp',
             '../src/opts/SkBlitMask_opts_none.cpp',
diff --git a/ports.gyp b/ports.gyp
index 068d2e1..26003de 100644
--- a/ports.gyp
+++ b/ports.gyp
@@ -153,10 +153,12 @@
         [ 'skia_os == "android"', {
           'sources!': [
             '../src/ports/SkDebug_stdio.cpp',
+            '../src/ports/SkDiscardableMemory_none.cpp',
             '../src/ports/SkPurgeableMemoryBlock_none.cpp',
           ],
           'sources': [
             '../src/ports/SkDebug_android.cpp',
+            '../src/ports/SkDiscardableMemory_ashmem.cpp',
             '../src/ports/SkFontConfigInterface_android.cpp',
             '../src/ports/SkFontConfigParser_android.cpp',
             '../src/ports/SkFontHost_fontconfig.cpp',
diff --git a/tests.gyp b/tests.gyp
index ed1d077..4c8053e 100644
--- a/tests.gyp
+++ b/tests.gyp
@@ -56,6 +56,7 @@
         '../tests/DequeTest.cpp',
         '../tests/DeviceLooperTest.cpp',
         '../tests/DiscardableMemoryPool.cpp',
+        '../tests/DiscardableMemoryTest.cpp',
         '../tests/DocumentTest.cpp',
         '../tests/DrawBitmapRectTest.cpp',
         '../tests/DrawPathTest.cpp',