Rename PNaCl

tests/pnacl_client_translator/nacl.scons

 # -*- python -*-
 # Copyright (c) 2011 The Native Client 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 platform
 import re        # For StripArchFromLDCommand hack.
 import os.path   # For getting basenames.
 
 Import('env')
@@ skipping 32 matching lines @@
          ./pnacl_support/${arch}/${file}
 
       Non-arch specific files:
          ./pnacl_support/pnacl_coordinator.js
          etc...
 
       Location of test-page, bitcode, etc.:
          ./mypage.html
          ./mybitcode.pexe
   '''
-  # TODO(jvoung): rename the "arm-untrusted" part to "pnacl-untrusted"
-  # since that is what it really should be.
   # TODO(jvoung): simplify how utman installs these files in the first
   # place so that mapping is pretty much one-to-one (someone could just
   # copy the files from the toolchain-dir to their webserver).
   map_files = []
   replicates = [] # track staging dependencies
-  toolchain_dir = '${SCONSTRUCT_DIR}/toolchain/linux_arm-untrusted'
+  toolchain_dir = '${PNACL_ROOT}'
   # TODO(jvoung): add ARM when we have a sandboxed LD in tools-sb.
   for arch in ['x8632', 'x8664']:
     toolchain_bin = '%s/tools-sb/%s/srpc/bin/' % (toolchain_dir,
                                                   arch)
     toolchain_binaries = [toolchain_bin + 'llc',
                           toolchain_bin + 'ld']
     # We should really be consistent and use directory structure
     # to separate the arch-specific ld_script instead of embedding
     # the arch in the basename.
     toolchain_ldscript = '%s/ldscripts/ld_script_%s_untrusted' % (toolchain_dir,
@@ skipping 90 matching lines @@
 bitcode_env.AddNodeToTestSuite(node,
                        ['chrome_browser_tests'],
                        'run_pnacl_srpc_hw_browser_test',
                                is_broken=no_ports_broken or \
              # http://code.google.com/p/nativeclient/issues/detail?id=1521 \
                                  env.Bit('target_x86_64') or \
                                  bitcode_env.PPAPIBrowserTesterIsBroken())
 
 
 # TODO(jvoung) Add a PPAPI example like pi_generator.