gn: Don't build sse3 code in skia with -msse4.1.

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 539 matching lines @@
     sources += gypi_skia_pdf.sources
   }
 
   if (is_android && !is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 }
 
 # 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
+if (current_cpu == "x86" || current_cpu == "x64") {
+  source_set("skia_opts_sse3") {
+    sources = gypi_skia_opts.ssse3_sources
+    if (!is_win || is_clang) {
+      cflags = [ "-mssse3" ]
+    }
+    if (is_win) {
+      defines = [ "SK_CPU_SSE_LEVEL=31" ]
+    }
+    visibility = [ ":skia_opts" ]
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [
+      ":skia_config",
+      ":skia_library_config",
+      "//build/config/compiler:no_chromium_code",
+    ]
+  }
+  source_set("skia_opts_sse4") {
+    sources = gypi_skia_opts.sse41_sources
+    if (!is_win || is_clang) {
+      cflags = [ "-msse4.1" ]
+    }
+    if (is_win) {
+      defines = [ "SK_CPU_SSE_LEVEL=41" ]
+    }
+    visibility = [ ":skia_opts" ]
+    configs -= [ "//build/config/compiler:chromium_code" ]
+    configs += [
+      ":skia_config",
+      ":skia_library_config",
+      "//build/config/compiler:no_chromium_code",
+    ]
+  }
+}
 source_set("skia_opts") {
   cflags = []
   defines = []
 
+  deps = [
+    "//base",
+  ]
+
   if (current_cpu == "x86" || current_cpu == "x64") {
-    sources = gypi_skia_opts.sse2_sources + gypi_skia_opts.ssse3_sources +
-              gypi_skia_opts.sse41_sources
-
-    if (!is_win || is_clang) {
-      cflags += [ "-msse4.1" ]
-    }
-    if (is_win) {
-      defines += [ "SK_CPU_SSE_LEVEL=41" ]
-    }
+    sources = gypi_skia_opts.sse2_sources
+    deps += [
+      ":skia_opts_sse3",
+      ":skia_opts_sse4",
+    ]
   } else if (current_cpu == "arm") {
     # The assembly uses the frame pointer register (r7 in Thumb/r11 in
     # ARM), the compiler doesn't like that.
     cflags += [ "-fomit-frame-pointer" ]
 
     if (arm_version >= 7) {
       sources = gypi_skia_opts.armv7_sources
       if (arm_use_neon || arm_optionally_use_neon) {
         sources += gypi_skia_opts.neon_sources
 
@@ skipping 24 matching lines @@
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 
   configs -= [ "//build/config/compiler:chromium_code" ]
   configs += [
     ":skia_config",
     ":skia_library_config",
     "//build/config/compiler:no_chromium_code",
   ]
 
-  deps = [
-    "//base",
-  ]
-
   visibility = [ ":skia" ]
 }
 
 test("skia_unittests") {
   sources = [
     "ext/analysis_canvas_unittest.cc",
     "ext/bitmap_platform_device_mac_unittest.cc",
     "ext/convolver_unittest.cc",
     "ext/image_operations_unittest.cc",
     "ext/pixel_ref_utils_unittest.cc",
@@ skipping 38 matching lines @@
       "tools/filter_fuzz_stub/filter_fuzz_stub.cc",
     ]
 
     deps = [
       ":skia",
       "//base",
       "//base/test:test_support",
     ]
   }
 }