Pull GN @ 252040, update calls

build/config/arm.gni

Index: build/config/arm.gni
diff --git a/build/config/arm.gni b/build/config/arm.gni
index b71ce3dad36735078a0ddec1dc3c12c2addba20e..cf6619c8d129c7c766b2115c637057454f5df838 100644
--- a/build/config/arm.gni
+++ b/build/config/arm.gni
@@ -2,53 +2,56 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-declare_args() {
-  # Version of the ARM processor when compiling on ARM. Ignored on non-ARM
-  # platforms.
-  arm_version = 7
+if (cpu_arch == "arm") {
+  declare_args() {
+    # Version of the ARM processor when compiling on ARM. Ignored on non-ARM
+    # platforms.
+    arm_version = 7
 
-  # The ARM floating point mode. This is either the string "hard", "soft", or
-  # "softfp". An empty string means to use the default one for the arm_version.
-  arm_float_abi = ""
-}
-
-assert(arm_float_abi == "" ||
-       arm_float_abi == "hard" ||
-       arm_float_abi == "soft" ||
-       arm_float_abi == "softfp")
+    # The ARM floating point mode. This is either the string "hard", "soft", or
+    # "softfp". An empty string means to use the default one for the
+    # arm_version.
+    arm_float_abi = ""
+  }
 
-if (is_android) {
-  arm_use_neon = false
-  # Our version of arm_neon_optional from common.gypi. This is not used in the
-  # current build so is commented out for now.
-  #arm_optionally_use_neon = false
-} else {
-  arm_use_neon = true
-  #arm_optionally_use_neon = true
-}
+  assert(arm_float_abi == "" ||
+         arm_float_abi == "hard" ||
+         arm_float_abi == "soft" ||
+         arm_float_abi == "softfp")
 
-if (arm_version == 6) {
-  arm_arch = "armv6"
-  arm_tune = ""
-  if (arm_float_abi == "") {
-    arm_float_abi = "softfp"
+  if (is_android) {
+    arm_use_neon = false
+    # Our version of arm_neon_optional from common.gypi. This is not used in the
+    # current build so is commented out for now.
+    #arm_optionally_use_neon = false
+  } else {
+    arm_use_neon = true
+    #arm_optionally_use_neon = true
   }
-  arm_fpu = "vfp"
-  # Thumb is a reduced instruction set available on some ARM processors that
-  # has increased code density.
-  arm_use_thumb = false
 
-} else if (arm_version == 7) {
-  arm_arch = "armv7-a"
-  arm_tune = ""
-  if (arm_float_abi == "") {
-    arm_float_abi = "softfp"
-  }
-  arm_use_thumb = true
+  if (arm_version == 6) {
+    arm_arch = "armv6"
+    arm_tune = ""
+    if (arm_float_abi == "") {
+      arm_float_abi = "softfp"
+    }
+    arm_fpu = "vfp"
+    # Thumb is a reduced instruction set available on some ARM processors that
+    # has increased code density.
+    arm_use_thumb = false
 
-  if (arm_use_neon) {
-    arm_fpu = "neon"
-  } else {
-    arm_fpu = "vfpv3-d16"
+  } else if (arm_version == 7) {
+    arm_arch = "armv7-a"
+    arm_tune = ""
+    if (arm_float_abi == "") {
+      arm_float_abi = "softfp"
+    }
+    arm_use_thumb = true
+
+    if (arm_use_neon) {
+      arm_fpu = "neon"
+    } else {
+      arm_fpu = "vfpv3-d16"
+    }
   }
 }