Revert of Add SSE4 version of BlurImage optimizations.

gyp/opts.gyp

Index: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 653006d0e3d6844ae6df8775f728294a828404b7..85c8c503fabbac5e766976c470528e19734bfd5a 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -212,39 +212,22 @@
         '../src/core',
       ],
       'conditions': [
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android", "mac"] \
            and not skia_android_framework', {
           'cflags': [
             '-msse4',
           ],
         }],
-        [ 'skia_os == "mac"', {
-          'xcode_settings': {
-            'OTHER_CPLUSPLUSFLAGS!': [
-              '-mssse3',
-            ],
-            'OTHER_CPLUSPLUSFLAGS': [
-              '-msse4',
-            ],
-          },
-        }],
-        [ 'skia_arch_type == "x86"', {
-          'sources': [
-            '../src/opts/SkBlurImage_opts_SSE4.cpp',
-          ],
-          'conditions': [
-            [ 'skia_arch_width == 64', {
-              'sources': [
-                '../src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
-              ],
-            }],
-            [ 'skia_arch_width == 32', {
-              'sources': [
-                '../src/opts/SkBlitRow_opts_SSE4_asm.S',
-              ],
-            }],
-          ],
-        }],
+        [ 'skia_arch_width == 64 and skia_arch_type == "x86"', {
+          'sources': [
+            '../src/opts/SkBlitRow_opts_SSE4_x64_asm.S',
+          ],
+        }],
+        [ 'skia_arch_width == 32 and skia_arch_type == "x86"', {
+          'sources': [
+            '../src/opts/SkBlitRow_opts_SSE4_asm.S',
+          ],
+       }],
       ],
     },
     # NEON code must be compiled with -mfpu=neon which also affects scalar