Chromium roll (https://codereview.chromium.org/976353002)

sky/engine/platform/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.
 
 import("//build/config/ui.gni")
 import("//sky/engine/build/scripts/scripts.gni")
 import("//sky/engine/config.gni")
 import("//testing/test.gni")
 
 # Most targets in this file are private actions so use that as the default.
@@ skipping 622 matching lines @@
       "exported/linux/WebFontRenderStyle.cpp",
       "fonts/linux/FontPlatformDataLinux.cpp",
     ]
     set_sources_assignment_filter(sources_assignment_filter)
   }
 
   if (is_linux) {
     direct_dependent_configs = [ "//build/config/linux:fontconfig" ]
   }
 
-  if (cpu_arch == "arm") {
+  if (target_cpu == "arm") {
     deps += [ ":sky_arm_neon" ]
   }
 }
 
 test("platform_unittests") {
   visibility += [ "//sky/*" ]
   output_name = "sky_platform_unittests"
 
   sources = [
     "ClockTest.cpp",
@@ skipping 52 matching lines @@
   # that injects the system thunks, so system calls don't actually work. This
   # just tricks the linker into thinking that an implementation of these calls
   # will be injected at runtime so the link succeeds.
   deps += [ "//mojo/public/platform/native:system" ]
 
   defines = [ "INSIDE_BLINK" ]
 
   include_dirs = [ "$root_build_dir" ]
 }
 
-if (cpu_arch == "arm") {
+if (target_cpu == "arm") {
   source_set("sky_arm_neon") {
     sources = [
       "graphics/cpu/arm/WebGLImageConversionNEON.h",
       "graphics/cpu/arm/filters/FEBlendNEON.h",
       "graphics/cpu/arm/filters/FECompositeArithmeticNEON.h",
       "graphics/cpu/arm/filters/FEGaussianBlurNEON.h",
       "graphics/cpu/arm/filters/NEONHelpers.h",
     ]
     # The *NEON.cpp files fail to compile when -mthumb is passed. Force
     # them to build in ARM mode.
     # See https://bugs.webkit.org/show_bug.cgi?id=62916.
     # TODO(GYP)
     #'cflags': ['-marm'],
     #    'conditions': [
     #      ['OS=="android"', {
     #        'cflags!': ['-mthumb'],
     #      }],
     #    ],
   }
 }