[NaCl SDK] Ship arm_elf_loader.nexe on all platforms

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 377 matching lines @@
   ]
 }
 
 
 def GypNinjaInstall(pepperdir, toolchains):
   tools_files_32 = [
     ['sel_ldr', 'sel_ldr_x86_32'],
     ['irt_core_newlib_x32.nexe', 'irt_core_x86_32.nexe'],
     ['irt_core_newlib_x64.nexe', 'irt_core_x86_64.nexe'],
   ]
+  arm_files = [
+    ['elf_loader_newlib_arm.nexe', 'elf_loader_arm.nexe'],
+  ]
 
   tools_files_64 = []
 
   platform = getos.GetPlatform()
 
   # TODO(binji): dump_syms doesn't currently build on Windows. See
   # http://crbug.com/245456
   if platform != 'win':
     tools_files_64 += [
       ['dump_syms', 'dump_syms'],
@@ skipping 14 matching lines @@
 
   tools_dir = os.path.join(pepperdir, 'tools')
   buildbot_common.MakeDir(tools_dir)
 
   # Add .exe extensions to all windows tools
   for pair in tools_files_32 + tools_files_64:
     if platform == 'win' and not pair[0].endswith('.nexe'):
       pair[0] += '.exe'
       pair[1] += '.exe'
 
-  InstallFiles(GetNinjaOutDir('x64'), tools_dir, tools_files_64)
-  InstallFiles(GetNinjaOutDir('ia32'), tools_dir, tools_files_32)
-
   # Add ARM binaries
   if platform == 'linux' and not options.no_arm_trusted:
-    arm_files = [
+    arm_files += [
       ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'],
-      ['elf_loader_newlib_arm.nexe', 'elf_loader_arm.nexe'],
       ['nacl_helper_bootstrap', 'nacl_helper_bootstrap_arm'],
       ['nonsfi_loader_newlib_arm_nonsfi.nexe', 'nonsfi_loader_arm'],
       ['sel_ldr', 'sel_ldr_arm']
     ]
-    InstallFiles(GetNinjaOutDir('arm'), tools_dir, arm_files)
+
+  InstallFiles(GetNinjaOutDir('x64'), tools_dir, tools_files_64)
+  InstallFiles(GetNinjaOutDir('ia32'), tools_dir, tools_files_32)
+  InstallFiles(GetNinjaOutDir('arm'), tools_dir, arm_files)
 
   for tc in toolchains:
     if tc in ('host', 'clang-newlib'):
       continue
     elif tc == 'pnacl':
       xarches = (None, 'ia32', 'x64', 'arm')
     elif tc in ('x86_glibc', 'x86_newlib'):
       xarches = ('ia32', 'x64')
     elif tc in ('arm_glibc', 'arm_bionic'):
       xarches = ('arm',)
@@ skipping 621 matching lines @@
       BuildStepArchivePNaClComponent(chrome_revision)
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')