Remove a few _sse2 targets now that we build with -msse2 everywhere.

No intended behavior change.

BUG=348761
CQ_INCLUDE_TRYBOTS=tryserver.blink:linux_blink_rel

Review URL: https://codereview.chromium.org/1152053004

Cr-Commit-Position: refs/heads/master@{#333333}

1 files changed, 8 insertions, 37 deletions

diff --git a/cc/cc.gyp b/cc/cc.gyp
index 0a40ce0..bd2ae27 100644
--- a/cc/cc.gyp
+++ b/cc/cc.gyp
@@ -20,7 +20,6 @@
         '<(DEPTH)/ui/events/events.gyp:events_base',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
         '<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry',
-        'cc_opts',
       ],
       'variables': {
         'optimize': 'max',
@@ -593,6 +592,14 @@
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],
+      'conditions': [
+        ['target_arch == "ia32" or target_arch == "x64"', {
+          'sources': [
+            'raster/texture_compressor_etc1_sse.cc',
+            'raster/texture_compressor_etc1_sse.h',
+          ],
+        }],
+      ],
     },
     {
       # GN version: //cc/surfaces
@@ -642,41 +649,5 @@
         '../build/android/increase_size_for_speed.gypi',
       ],
     },
-    {
-      'target_name': 'cc_opts',
-      'type': 'static_library',
-      'conditions': [
-        ['target_arch == "ia32" or target_arch == "x64"', {
-          'defines': [
-            'CC_IMPLEMENTATION=1',
-          ],
-          'dependencies': [
-            'cc_opts_sse',
-          ]          
-        }],
-      ],  
-    },    
-    {
-      'target_name': 'cc_opts_sse',
-      'type': 'static_library',
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-      ],
-      'conditions': [
-        ['target_arch == "ia32" or target_arch == "x64"', {
-          'defines': [
-            'CC_IMPLEMENTATION=1',
-          ],
-          'sources': [
-            # Conditional compilation for SSE2 code on x86 and x64 machines
-            'raster/texture_compressor_etc1_sse.cc',
-            'raster/texture_compressor_etc1_sse.h',
-          ],
-          'cflags': [
-            '-msse2',
-          ],
-        }],
-      ],
-    },    
   ],
 }