[NaCl SDK] Add ARM sel_ldr to linux SDK

native_client_sdk/src/build_tools/build_sdk.py

Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index b03e0f5f8dd00ad38d69cac8e7bc997d49946919..71832225b75e2cc51551681fb53520e9674ed51a 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -409,8 +409,11 @@ def GypNinjaInstall(pepperdir, toolchains):
   ninja_out_dir = os.path.join(OUT_DIR, build_dir, 'Release')
   tools_files = [
     ['sel_ldr', 'sel_ldr_x86_32'],
+    ['sel_ldr_x86_64', 'sel_ldr_x86_64'],
+    ['sel_ldr_arm', 'sel_ldr_arm'],
     ['ncval_new', 'ncval'],
-    ['irt_core_newlib_x32.nexe', 'irt_core_x86_32.nexe'],
+    ['irt_core_newlib_arm.nexe', 'irt_core_arm.nexe'],
+    ['irt_core_newlib_x64.nexe', 'irt_core_x86_64.nexe'],

[noelallen1, 2014/03/08 01:02:53]

x86_32?

     ['irt_core_newlib_x64.nexe', 'irt_core_x86_64.nexe'],
   ]
 
@@ -425,13 +428,13 @@ def GypNinjaInstall(pepperdir, toolchains):
       ['minidump_stackwalk', 'minidump_stackwalk']
     ]
 
-  tools_files.append(['sel_ldr64', 'sel_ldr_x86_64'])
-
   if platform == 'linux':
     tools_files.append(['nacl_helper_bootstrap',
                         'nacl_helper_bootstrap_x86_32'])
-    tools_files.append(['nacl_helper_bootstrap64',
+    tools_files.append(['nacl_helper_bootstrap_x86_64',
                         'nacl_helper_bootstrap_x86_64'])
+    tools_files.append(['nacl_helper_bootstrap_arm',
+                        'nacl_helper_bootstrap_arm'])
 
   buildbot_common.MakeDir(os.path.join(pepperdir, 'tools'))
 
@@ -480,16 +483,24 @@ def GypNinjaBuild_NaCl(rel_out_dir):
     out_dir_64 = MakeNinjaRelPath(rel_out_dir + '-64')
     GypNinjaBuild('x64', gyp_py, nacl_core_sdk_gyp, 'sel_ldr', out_dir_64)
 
-    # We only need sel_ldr from the 64-bit out directory.
-    # sel_ldr needs to be renamed, so we'll call it sel_ldr64.
-    files_to_copy = [('sel_ldr', 'sel_ldr64')]
+    files_to_copy = ['sel_ldr']
     if platform == 'linux':
-      files_to_copy.append(('nacl_helper_bootstrap', 'nacl_helper_bootstrap64'))
+      files_to_copy.append('nacl_helper_bootstrap')
 
-    for src, dst in files_to_copy:
+    out_dir = os.path.join(SRC_DIR, out_dir, 'Release')
+    out_dir_64 = os.path.join(SRC_DIR, out_dir_64, 'Release')
+    out_dir_arm = os.path.join(SRC_DIR, out_dir_arm, 'Release')
+
+    for src in files_to_copy:
+      buildbot_common.CopyFile(
+          os.path.join(out_dir_64, src), os.path.join(out_dir, src + '_x86_64'))
+      buildbot_common.CopyFile(
+          os.path.join(out_dir_arm, src), os.path.join(out_dir, src + '_arm'))
+
+    if platform == 'linux':
       buildbot_common.CopyFile(
-          os.path.join(SRC_DIR, out_dir_64, 'Release', src),
-          os.path.join(SRC_DIR, out_dir, 'Release', dst))
+          os.path.join(out_dir_arm, 'irt_core_newlib_arm.nexe'),
+          os.path.join(out_dir, 'irt_core_newlib_arm.nexe'))
 
 
 def GypNinjaBuild_Breakpad(rel_out_dir):