1 files changed, 22 insertions, 34 deletions
diff --git a/chromium/skia/skia.gyp b/chromium/skia/skia.gyp
index 0f13b69bafd..ca063d13be3 100644
--- a/chromium/skia/skia.gyp
+++ b/chromium/skia/skia.gyp
@@ -14,8 +14,8 @@
           'target_name': 'skia_library',
           'type': 'static_library',
           'includes': [
-            'skia_library.gypi',
             'skia_common.gypi',
+            'skia_library.gypi',
             '../build/android/increase_size_for_speed.gypi',
             # Disable LTO due to compiler error
             # in mems_in_disjoint_alias_sets_p, at alias.c:393
@@ -56,9 +56,12 @@
           'target_name': 'skia',
           'type': 'shared_library',
           'includes': [
-            'skia_library.gypi',
-            'skia_chrome.gypi',
+            # Include skia_common.gypi first since it contains filename
+            # exclusion rules. This allows the following includes to override
+            # the exclusion rules.
             'skia_common.gypi',
+            'skia_chrome.gypi',
+            'skia_library.gypi',
             '../build/android/increase_size_for_speed.gypi',
           ],
           'defines': [
@@ -88,37 +91,6 @@
   # targets that are not dependent upon the component type
   'targets': [
     {
-      'target_name': 'skia_chrome_opts',
-      'type': 'static_library',
-      'include_dirs': [
-        '..',
-        'config',
-        '../third_party/skia/include/core',
-      ],
-      'conditions': [
-        [ 'os_posix == 1 and OS != "mac" and OS != "android" and \
-            target_arch != "arm" and target_arch != "mipsel" and \
-            target_arch != "arm64" and target_arch != "mips64el"', {
-          'cflags': [
-            '-msse2',
-          ],
-        }],
-        [ 'target_arch != "arm" and target_arch != "mipsel" and \
-           target_arch != "arm64" and target_arch != "mips64el"', {
-          'sources': [
-            'ext/convolver_SSE2.cc',
-            'ext/convolver_SSE2.h',
-          ],
-        }],
-        [ 'target_arch == "mipsel" and mips_dsp_rev >= 2',{
-          'sources': [
-            'ext/convolver_mips_dspr2.cc',
-            'ext/convolver_mips_dspr2.h',
-          ],
-        }],
-      ],
-    },
-    {
       'target_name': 'image_operations_bench',
       'type': 'executable',
       'dependencies': [
@@ -147,5 +119,21 @@
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
+    {
+      'target_name': 'skia_mojo',
+      'type': 'static_library',
+      'dependencies': [
+        'skia',
+        '../base/base.gyp:base',
+      ],
+      'includes': [
+        '../third_party/mojo/mojom_bindings_generator.gypi',
+      ],
+      'sources': [
+        # Note: file list duplicated in GN build.
+        'public/interfaces/bitmap.mojom',
+        'public/type_converters.cc',
+      ],
+    },
   ],
 }