Revert of Add SSE4 version of BlurImage optimizations.

gyp/opts.gyp

 # Gyp file for opts projects
 {
   'targets': [
     # Due to an unfortunate intersection of lameness between gcc and gyp,
     # we have to build the *_SSE2.cpp files in a separate target.  The
     # gcc lameness is that, in order to compile SSE2 intrinsics code, it
     # must be passed the -msse2 flag.  However, with this flag, it may
     # emit SSE2 instructions even for scalar code, such as the CPUID
     # test used to test for the presence of SSE2.  So that, and all other
     # code must be compiled *without* -msse2.  The gyp lameness is that it
@@ skipping 194 matching lines @@
       'type': 'static_library',
       'standalone_static_library': 1,
       'dependencies': [
         'core.gyp:*',
         'effects.gyp:*'
       ],
       'include_dirs': [
         '../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"', {
+        [ 'skia_arch_width == 64 and 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',
-              ],
-            }],
+            '../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
     # code. To support dynamic NEON code paths, we need to build all
     # NEON-specific sources in a separate static library. The situation
     # is very similar to the SSSE3 and SSE4 one.
     {
       'target_name': 'opts_neon',
       'product_name': 'skia_opts_neon',
       'type': 'static_library',
@@ skipping 32 matching lines @@
         '../src/opts/SkBitmapProcState_matrix_neon.h',
         '../src/opts/SkBlitMask_opts_arm_neon.cpp',
         '../src/opts/SkBlitRow_opts_arm_neon.cpp',
         '../src/opts/SkBlurImage_opts_neon.cpp',
         '../src/opts/SkMorphology_opts_neon.cpp',
         '../src/opts/SkXfermode_opts_arm_neon.cpp',
       ],
     },
   ],
 }