skia: Simplify SSE2 logic a bit.

skia/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 if (current_cpu == "arm") {
   import("//build/config/arm.gni")
 }
@@ skipping 300 matching lines @@
     "ext/skia_utils_base.cc",
     "ext/skia_utils_base.h",
     "ext/skia_utils_ios.h",
     "ext/skia_utils_ios.mm",
     "ext/skia_utils_mac.h",
     "ext/skia_utils_mac.mm",
     "ext/skia_utils_win.cc",
     "ext/skia_utils_win.h",
   ]
 
+  if (current_cpu == "x86" || current_cpu == "x64") {
+    sources += [
+      "ext/convolver_SSE2.cc",
+      "ext/convolver_SSE2.h",
+    ]
+  } else if (current_cpu == "mipsel" && mips_dsp_rev >= 2) {
+    sources += [
+      "ext/convolver_mips_dspr2.cc",
+      "ext/convolver_mips_dspr2.h",
+    ]
+  }
+
   # The skia gypi values are relative to the skia_dir, so we need to rebase.
   sources += gypi_skia_core.sources
   sources += gypi_skia_effects.sources
   sources += gypi_skia_utils.sources
   sources += gypi_values.skia_library_sources
 
   # This and skia_opts are really the same conceptual target so share headers.
   allow_circular_includes_from = [ ":skia_opts" ]
 
   if (current_cpu == "arm") {
@@ skipping 214 matching lines @@
 }
 
 # Separated out so it can be compiled with different flags for SSE.
 # TODO(GYP): This is wrong, it needs one target per arch http://crbug.com/496512
 source_set("skia_opts") {
   cflags = []
   defines = []
 
   if (current_cpu == "x86" || current_cpu == "x64") {
     sources = gypi_skia_opts.sse2_sources + gypi_skia_opts.ssse3_sources +
-              gypi_skia_opts.sse41_sources +
-              [
-                # Chrome-specific.
-                "ext/convolver_SSE2.cc",
-                "ext/convolver_SSE2.h",
-              ]
+              gypi_skia_opts.sse41_sources
 
     if (!is_win || is_clang) {
       cflags += [ "-msse4.1" ]
     }
     if (is_win) {
       defines += [ "SK_CPU_SSE_LEVEL=41" ]
     }
   } else if (current_cpu == "arm") {
     # The assembly uses the frame pointer register (r7 in Thumb/r11 in
     # ARM), the compiler doesn't like that.
@@ skipping 12 matching lines @@
         }
       }
     } else {
       sources = gypi_skia_opts.none_sourcees
     }
   } else if (current_cpu == "mipsel") {
     cflags += [ "-fomit-frame-pointer" ]
 
     if (mips_dsp_rev >= 1) {
       sources = gypi_skia_opts.mips_dsp_sources
-      if (mips_dsp_rev >= 2) {
-        sources += [
-          # Chrome-specific.
-          "ext/convolver_mips_dspr2.cc",
-          "ext/convolver_mips_dspr2.h",
-        ]
-      }
     } else {
       sources = gypi_skia_opts.none_sources
     }
   } else {
     assert(false, "Need to port cpu specific stuff from skia_library_opts.gyp")
   }
 
   if (is_android && !is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
@@ skipping 61 matching lines @@
       "tools/filter_fuzz_stub/filter_fuzz_stub.cc",
     ]
 
     deps = [
       ":skia",
       "//base",
       "//base/test:test_support",
     ]
   }
 }