Revert 263093 "roll skia DEPS to 14128"

trunk/src/skia/skia_library_opts.gyp

Index: trunk/src/skia/skia_library_opts.gyp
===================================================================
--- trunk/src/skia/skia_library_opts.gyp	(revision 263111)
+++ trunk/src/skia/skia_library_opts.gyp	(working copy)
@@ -51,7 +51,7 @@
             '../third_party/skia/src/opts/SkBlitRect_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_SSE2.cpp',
-            '../third_party/skia/src/opts/SkXfermode_opts_SSE2.cpp',
+            '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
             '../third_party/skia/src/opts/SkBitmapFilter_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkMorphology_opts_SSE2.cpp',
             '../third_party/skia/src/opts/SkBlurImage_opts_SSE2.cpp',
@@ -143,20 +143,15 @@
           ],
         }],
         [ 'target_arch == "arm64"',{
+          # TODO(rmcilroy): Update this once http://crrev.com/143423004/ lands.
           'sources': [
-            '../third_party/skia/src/opts/SkBitmapProcState_arm_neon.cpp',
-            '../third_party/skia/src/opts/SkBitmapProcState_matrixProcs_neon.cpp',
-            '../third_party/skia/src/opts/SkBitmapProcState_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkBlitMask_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkBlitMask_opts_arm_neon.cpp',
+            '../third_party/skia/src/opts/SkBitmapProcState_opts_none.cpp',
+            '../third_party/skia/src/opts/SkBlitMask_opts_none.cpp',
             '../third_party/skia/src/opts/SkBlitRow_opts_none.cpp',
-            '../third_party/skia/src/opts/SkBlurImage_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkBlurImage_opts_neon.cpp',
-            '../third_party/skia/src/opts/SkMorphology_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkMorphology_opts_neon.cpp',
             '../third_party/skia/src/opts/SkUtils_opts_none.cpp',
-            '../third_party/skia/src/opts/SkXfermode_opts_arm.cpp',
-            '../third_party/skia/src/opts/SkXfermode_opts_arm_neon.cpp',
+            '../third_party/skia/src/opts/SkXfermode_opts_none.cpp',
+            '../third_party/skia/src/opts/SkMorphology_opts_none.cpp',
+            '../third_party/skia/src/opts/SkBlurImage_opts_none.cpp',
           ],
         }],
       ],