Revert of Enable the SSSE3 compile time check on all platforms.

gyp/opts.gyp

Index: gyp/opts.gyp
diff --git a/gyp/opts.gyp b/gyp/opts.gyp
index 55306e4ee106c442c3d8bb547333730de7f72eec..0c1bc0a0c9b07aa20882961fa2732a823715dd8e 100644
--- a/gyp/opts.gyp
+++ b/gyp/opts.gyp
@@ -188,18 +188,17 @@
         '../src/core',
         '../src/utils',
       ],
-      'sources': [
-        '../src/opts/SkBitmapProcState_opts_SSSE3.cpp',
-      ],
       'conditions': [
-        [ 'skia_os == "win"', {
-            'defines' : [ 'SK_CPU_SSE_LEVEL=31' ],
-        }],
-        # (Mac has -mssse3 globally.)
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
            and not skia_android_framework', {
           'cflags': [
             '-mssse3',
+          ],
+        }],
+        # (Mac has -mssse3 globally.)
+        [ 'skia_arch_type == "x86"', {
+          'sources': [
+            '../src/opts/SkBitmapProcState_opts_SSSE3.cpp',
           ],
         }],
       ],
@@ -221,27 +220,11 @@
         '../src/core',
         '../src/utils',
       ],
-      '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_os == "win"', {
-            'defines' : [ 'SK_CPU_SSE_LEVEL=41' ],
-        }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "nacl", "chromeos", "android"] \
            and not skia_android_framework', {
           'cflags': [
-            '-msse4.1',
+            '-msse4',
           ],
         }],
         [ 'skia_os == "mac"', {
@@ -250,9 +233,26 @@
               '-mssse3',
             ],
             'OTHER_CPLUSPLUSFLAGS': [
-              '-msse4.1',
+              '-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',
+              ],
+            }],
+          ],
         }],
       ],
     },