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}

4 files changed, 24 insertions, 107 deletions

diff --git a/cc/BUILD.gn b/cc/BUILD.gn
index e3a9bb5..22df7d0 100644
--- a/cc/BUILD.gn
+++ b/cc/BUILD.gn
@@ -531,6 +531,13 @@ component("cc") {
     "trees/tree_synchronizer.h",
   ]
 
+  if (target_cpu == "x86" || target_cpu == "x64") {
+    sources += [
+      "raster/texture_compressor_etc1_sse.cc",
+      "raster/texture_compressor_etc1_sse.h",
+    ]
+  }
+
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 
@@ -541,7 +548,6 @@ component("cc") {
   deps = [
     "//base",
     "//base/third_party/dynamic_annotations",
-    "//cc:cc_opts",
     "//cc/surfaces:surface_id",
     "//gpu",
     "//gpu/command_buffer/client:gles2_interface",
@@ -559,36 +565,6 @@ component("cc") {
   }
 }
 
-source_set("cc_opts") {
-  public_deps = [
-    "//cc:cc_opts_sse",
-  ]
-}
-
-source_set("cc_opts_sse") {
-  if (target_cpu == "x86" || target_cpu == "x64") {
-    deps = [
-      "//base",
-    ]
-
-    defines = [ "CC_IMPLEMENTATION=1" ]
-
-    if (!is_debug && (is_win || is_android)) {
-      configs -= [ "//build/config/compiler:optimize" ]
-      configs += [ "//build/config/compiler:optimize_max" ]
-    }
-
-    sources = [
-      "raster/texture_compressor.h",
-      "raster/texture_compressor_etc1.h",
-      "raster/texture_compressor_etc1_sse.cc",
-      "raster/texture_compressor_etc1_sse.h",
-    ]
-
-    cflags = [ "-msse2" ]
-  }
-}
-
 source_set("test_support") {
   testonly = true
   sources = [
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',
-          ],
-        }],
-      ],
-    },    
   ],
 }
diff --git a/media/base/BUILD.gn b/media/base/BUILD.gn
index d81171e..29547f3 100644
--- a/media/base/BUILD.gn
+++ b/media/base/BUILD.gn
@@ -272,11 +272,13 @@ source_set("base") {
   }
 
   if (current_cpu == "x86" || current_cpu == "x64") {
-    sources += [ "simd/convert_yuv_to_rgb_x86.cc" ]
-    deps += [
-      ":media_yasm",
-      ":media_sse2",
+    sources += [
+      "simd/convert_rgb_to_yuv_sse2.cc",
+      "simd/convert_rgb_to_yuv_ssse3.cc",
+      "simd/convert_yuv_to_rgb_x86.cc",
+      "simd/filter_yuv_sse2.cc",
     ]
+    deps += [ ":media_yasm" ]
   }
 
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
@@ -464,21 +466,6 @@ source_set("perftests") {
 }
 
 if (current_cpu == "x86" || current_cpu == "x64") {
-  source_set("media_sse2") {
-    sources = [
-      "simd/convert_rgb_to_yuv_sse2.cc",
-      "simd/convert_rgb_to_yuv_ssse3.cc",
-      "simd/filter_yuv_sse2.cc",
-    ]
-    configs += [
-      "//media:media_config",
-      "//media:media_implementation",
-    ]
-    if (!is_win) {
-      cflags = [ "-msse2" ]
-    }
-  }
-
   import("//third_party/yasm/yasm_assemble.gni")
   yasm_assemble("media_yasm") {
     sources = [
diff --git a/media/media.gyp b/media/media.gyp
index 5b32db6..4427bf0 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1041,10 +1041,12 @@
         ['target_arch=="ia32" or target_arch=="x64"', {
           'dependencies': [
             'media_asm',
-            'media_sse2',
           ],
           'sources': [
+            'base/simd/convert_rgb_to_yuv_sse2.cc',
+            'base/simd/convert_rgb_to_yuv_ssse3.cc',
             'base/simd/convert_yuv_to_rgb_x86.cc',
+            'base/simd/filter_yuv_sse2.cc',
           ],
         }],
         ['OS!="linux" and OS!="win"', {
@@ -1640,25 +1642,6 @@
             '../third_party/yasm/yasm_compile.gypi',
           ],
         },
-        {
-          # GN version: //media/base:media_sse2
-          'target_name': 'media_sse2',
-          'type': 'static_library',
-          'cflags': [
-            '-msse2',
-          ],
-          'defines': [
-            'MEDIA_IMPLEMENTATION',
-          ],
-          'include_dirs': [
-            '..',
-          ],
-          'sources': [
-            'base/simd/convert_rgb_to_yuv_sse2.cc',
-            'base/simd/convert_rgb_to_yuv_ssse3.cc',
-            'base/simd/filter_yuv_sse2.cc',
-          ],
-        },
       ], # targets
     }],
     ['OS=="android"', {