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

mojo/public/mojo_application.gni

 # 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/module_args/mojo.gni")
 import("mojo.gni")
 import("mojo_sdk.gni")
 
 # Generate a binary mojo application.The parameters of this template are those
 # of a shared library.
@@ skipping 137 matching lines @@
         "${library_dir}/${library_name}",
       ]
       outputs = [
         "${root_out_dir}/${output}",
       ]
     }
   } else {
     nexe_target_name = base_target_name + "_nexe"
     nexe_name = base_target_name + ".nexe"
 
-    output = "${base_target_name}_${cpu_arch}.nexe.mojo"
+    output = "${base_target_name}_${target_cpu}.nexe.mojo"
 
     executable(nexe_target_name) {
       output_name = base_target_name
 
       if (defined(invoker.cflags)) {
         cflags = invoker.cflags
       }
       if (defined(invoker.cflags_c)) {
         cflags_c = invoker.cflags_c
       }
@@ skipping 176 matching lines @@
       rebase_input = rebase_path(input, root_build_dir)
       rebase_output = rebase_path(output, root_build_dir)
       args = [
         "--input=$rebase_input",
         "--output=$rebase_output",
         "--line=#!mojo mojo:android_handler",
       ]
     }
   }
 }