Activate IRT building on ARM for NaCl.

chrome/build_nacl_irt.py

 #!/usr/bin/python
 # Copyright (c) 2011 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 optparse
 import os
 import re
 import shutil
 import subprocess
@@ skipping 145 matching lines @@
       devnull = open(os.devnull, 'r')
     else:
       devnull = None
     p = subprocess.Popen(cmd, cwd=NACL_DIR, stdin=devnull)
     p.wait()
     if p.returncode != 0:
       sys.exit(3)
   # Copy out each platform after stripping.
   for platform in platforms:
     uplatform = platform.replace('-', '_')
-    platform2 = {'x86-32': 'i686', 'x86-64': 'x86_64'}.get(platform, platform)
+    # NaCl Trusted code is in thumb2 mode in CrOS, but as yet,
+    # untrusted code is still in classic ARM mode
+    # arm-thumb2 is for the future when untrusted code is in thumb2 as well
+    platform2 = {'arm': 'pnacl',
+                 'arm-thumb2' : 'pnacl',
+                 'x86-32': 'i686',
+                 'x86-64': 'x86_64'}.get(platform, platform)
     cplatform = {
         'win32': 'win',
         'cygwin': 'win',
         'darwin': 'mac',
     }.get(sys.platform, 'linux')
     nexe = os.path.join(out_dir, 'nacl_irt_' + uplatform + '.nexe')
-    cmd = [
-      '../native_client/toolchain/' + cplatform + '_x86_newlib/bin/' +
+    if platform in ['arm', 'arm-thumb2']:
+      cmd = [
+          '../native_client/toolchain/pnacl_linux_x86_64_newlib/bin/' +
+          platform2 + '-strip',
+          '--strip-debug',
+          '../native_client/scons-out/nacl_irt-' + platform \
+            + '/staging/irt.nexe',
+          '-o', nexe
+          ]
+    else:
+      cmd = [
+          '../native_client/toolchain/' + cplatform + '_x86_newlib/bin/' +
           platform2 + '-nacl-strip',
-      '--strip-debug',
-      '../native_client/scons-out/nacl_irt-' + platform + '/staging/irt.nexe',
-      '-o', nexe
-    ]
+          '--strip-debug',
+          '../native_client/scons-out/nacl_irt-' + platform \
+            + '/staging/irt.nexe',
+          '-o', nexe
+          ]
     print 'Running: ' + ' '.join(cmd)
     p = subprocess.Popen(cmd, cwd=SCRIPT_DIR)
     p.wait()
     if p.returncode != 0:
       sys.exit(4)
 
 
 def Main(argv):
   parser = optparse.OptionParser()
   parser.add_option('--inputs', dest='inputs', default=False,
@@ skipping 11 matching lines @@
     sys.exit(1)
 
   if options.inputs:
     PrintInputs(options.platforms)
   else:
     BuildIRT(options.platforms, options.outdir)
 
 
 if __name__ == '__main__':
   Main(sys.argv)