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

mojo/nacl/BUILD.gn

 # Copyright 2015 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.
 
 # Trusted code
 if (!is_nacl) {
   # A simple shell for running untrusted binaries that talk to the Mojo
   # embedder. (No services.)
   executable("monacl_shell") {
     testonly = true
     sources = [
       "monacl_shell.cc",
     ]
     deps = [
       "//base:base",
       "//mojo/edk/system:system",
       "//nacl_bindings:monacl_sel",
     ]
 
-    data_deps = [ "//nacl_bindings:irt_mojo(//native_client/build/toolchain/nacl:irt_${cpu_arch})" ]
+    data_deps = [ "//nacl_bindings:irt_mojo(//native_client/build/toolchain/nacl:irt_${target_cpu})" ]
   }
 }
 
 # Untrusted code
 if (is_nacl) {
   # Unit test for the Mojo public API.
   executable("monacl_test") {
     testonly = true
     sources = [
       "//mojo/public/cpp/system/tests/core_unittest.cc",
@@ skipping 11 matching lines @@
 
 group("mojo_nacl") {
   deps = [
     "//services/nacl:nacl_content_handler",
   ]
 }
 
 group("mojo_nacl_tests") {
   testonly = true
   nacl_toolchain =
-      "//native_client/build/toolchain/nacl:clang_newlib_${cpu_arch}"
+      "//native_client/build/toolchain/nacl:clang_newlib_${target_cpu}"
   deps = [
     ":monacl_shell",
     ":monacl_test($nacl_toolchain)",
     "//examples/apptest($nacl_toolchain)",
     "//examples/wget($nacl_toolchain)",
   ]
 }