Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

build/secondary/third_party/libjpeg_turbo/BUILD.gn

 # Copyright 2014 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.
 
 # Do not use the targets in this file unless you need a certain libjpeg
 # implementation. Use the meta target //third_party:jpeg instead.
 
-if (current_cpu == "arm") {
+if (cpu_arch == "arm") {
   import("//build/config/arm.gni")
 }
 
-if (current_cpu == "x86" || current_cpu == "x64") {
+if (cpu_arch == "x86" || cpu_arch == "x64") {
   import("//third_party/yasm/yasm_assemble.gni")
 
   yasm_assemble("simd_asm") {
     defines = []
 
-    if (current_cpu == "x86") {
+    if (cpu_arch == "x86") {
       sources = [
         "simd/jccolmmx.asm",
         "simd/jccolss2.asm",
         "simd/jcgrammx.asm",
         "simd/jcgrass2.asm",
         "simd/jcqnt3dn.asm",
         "simd/jcqntmmx.asm",
         "simd/jcqnts2f.asm",
         "simd/jcqnts2i.asm",
         "simd/jcqntsse.asm",
@@ skipping 16 matching lines @@
         "simd/jimmxint.asm",
         "simd/jimmxred.asm",
         "simd/jiss2flt.asm",
         "simd/jiss2fst.asm",
         "simd/jiss2int.asm",
         "simd/jiss2red.asm",
         "simd/jisseflt.asm",
         "simd/jsimdcpu.asm",
       ]
       defines += [ "__x86__" ]
-    } else if (current_cpu == "x64") {
+    } else if (cpu_arch == "x64") {
       sources = [
         "simd/jccolss2-64.asm",
         "simd/jcgrass2-64.asm",
         "simd/jcqnts2f-64.asm",
         "simd/jcqnts2i-64.asm",
         "simd/jcsamss2-64.asm",
         "simd/jdcolss2-64.asm",
         "simd/jdmerss2-64.asm",
         "simd/jdsamss2-64.asm",
         "simd/jfss2fst-64.asm",
         "simd/jfss2int-64.asm",
         "simd/jfsseflt-64.asm",
         "simd/jiss2flt-64.asm",
         "simd/jiss2fst-64.asm",
         "simd/jiss2int-64.asm",
         "simd/jiss2red-64.asm",
       ]
       defines += [ "__x86_64__" ]
     }
 
     if (is_win) {
       defines += [ "MSVC" ]
       include_dirs = [ "win" ]
-      if (current_cpu == "x86") {
+      if (cpu_arch == "x86") {
         defines += [ "WIN32" ]
       } else {
         defines += [ "WIN64" ]
       }
     } else if (is_mac) {
       defines += [ "MACHO" ]
       include_dirs = [ "mac" ]
     } else if (is_linux || is_android) {
       defines += [ "ELF" ]
       include_dirs = [ "linux" ]
     }
   }
 }
 
 source_set("simd") {
-  if (current_cpu == "x86") {
+  if (cpu_arch == "x86") {
     deps = [
       ":simd_asm",
     ]
     sources = [
       "simd/jsimd_i386.c",
     ]
     if (is_win) {
       cflags = [ "/wd4245" ]
     }
-  } else if (current_cpu == "x64") {
+  } else if (cpu_arch == "x64") {
     deps = [
       ":simd_asm",
     ]
     sources = [
       "simd/jsimd_x86_64.c",
     ]
-  } else if (current_cpu == "arm" && arm_version >= 7 &&
+  } else if (cpu_arch == "arm" && arm_version >= 7 &&
              (arm_use_neon || arm_optionally_use_neon)) {
     sources = [
       "simd/jsimd_arm.c",
       "simd/jsimd_arm_neon.S",
     ]
   } else {
     sources = [
       "jsimd_none.c",
     ]
   }
@@ skipping 79 matching lines @@
   if (is_msan || is_linux) {
     sources += [ "jsimd_none.c" ]
   } else {
     deps = [
       ":simd",
     ]
   }
 
   # TODO(GYP): Compile the .asm files with YASM as GYP does.
 }