Port SkXfermode opts to SkOpts.h

gyp/opts.gypi

Index: gyp/opts.gypi
diff --git a/gyp/opts.gypi b/gyp/opts.gypi
index 0c3cf208caca37f33791ff67e6fcdc874d982fd7..3b0dc7a46059709a55578cc83af88da829dfe956 100644
--- a/gyp/opts.gypi
+++ b/gyp/opts.gypi
@@ -10,7 +10,6 @@
             '<(skia_src_path)/opts/SkBlurImage_opts_none.cpp',
             '<(skia_src_path)/opts/SkMorphology_opts_none.cpp',
             '<(skia_src_path)/opts/SkTextureCompression_opts_none.cpp',
-            '<(skia_src_path)/opts/SkXfermode_opts_none.cpp',
         ],
 
         'armv7_sources': [
@@ -20,7 +19,6 @@
             '<(skia_src_path)/opts/SkBlurImage_opts_arm.cpp',
             '<(skia_src_path)/opts/SkMorphology_opts_arm.cpp',
             '<(skia_src_path)/opts/SkTextureCompression_opts_arm.cpp',
-            '<(skia_src_path)/opts/SkXfermode_opts_arm.cpp',
         ],
         'neon_sources': [
             '<(skia_src_path)/opts/SkBitmapProcState_arm_neon.cpp',
@@ -30,7 +28,6 @@
             '<(skia_src_path)/opts/SkBlurImage_opts_neon.cpp',
             '<(skia_src_path)/opts/SkMorphology_opts_neon.cpp',
             '<(skia_src_path)/opts/SkTextureCompression_opts_neon.cpp',
-            '<(skia_src_path)/opts/SkXfermode_opts_arm_neon.cpp',
             '<(skia_src_path)/opts/SkOpts_neon.cpp',
         ],
         'arm64_sources': [
@@ -46,8 +43,6 @@
             '<(skia_src_path)/opts/SkMorphology_opts_arm.cpp',
             '<(skia_src_path)/opts/SkMorphology_opts_neon.cpp',
             '<(skia_src_path)/opts/SkTextureCompression_opts_none.cpp',
-            '<(skia_src_path)/opts/SkXfermode_opts_arm.cpp',
-            '<(skia_src_path)/opts/SkXfermode_opts_arm_neon.cpp',
             '<(skia_src_path)/opts/SkOpts_neon.cpp',
         ],
 
@@ -58,7 +53,6 @@
             '<(skia_src_path)/opts/SkBlurImage_opts_none.cpp',
             '<(skia_src_path)/opts/SkMorphology_opts_none.cpp',
             '<(skia_src_path)/opts/SkTextureCompression_opts_none.cpp',
-            '<(skia_src_path)/opts/SkXfermode_opts_none.cpp',
         ],
 
         'sse2_sources': [
@@ -68,7 +62,6 @@
             '<(skia_src_path)/opts/SkBlurImage_opts_SSE2.cpp',
             '<(skia_src_path)/opts/SkMorphology_opts_SSE2.cpp',
             '<(skia_src_path)/opts/SkTextureCompression_opts_none.cpp',
-            '<(skia_src_path)/opts/SkXfermode_opts_none.cpp',
             '<(skia_src_path)/opts/opts_check_x86.cpp',
             '<(skia_src_path)/opts/SkOpts_sse2.cpp',
         ],