Enable some sandboxed translation tests

site_scons/site_tools/naclsdk.py

Index: site_scons/site_tools/naclsdk.py
diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py
index 7d31a10e56b47011ebb375243059e8de7c304eb0..4bc64eff9e41c82f3450b56589598c222fbf7f52 100755
--- a/site_scons/site_tools/naclsdk.py
+++ b/site_scons/site_tools/naclsdk.py
@@ -230,6 +230,8 @@ def _SetEnvForPnacl(env, root):
   else:
     subroot = root + '/newlib'
 
+  translator_root = os.path.join(os.path.dirname(root), 'pnacl_translator')
+
   binprefix = os.path.join(subroot, 'bin', 'pnacl-')
   binext = ''
   if env.Bit('host_windows'):
@@ -254,7 +256,12 @@ def _SetEnvForPnacl(env, root):
   pnacl_as = binprefix + 'as' + binext
   pnacl_nm = binprefix + 'nm' + binext
   pnacl_ranlib = binprefix + 'ranlib' + binext
-  pnacl_translate = binprefix + 'translate' + binext
+  # Use the standalone sandboxed translator in sbtc mode
+  if env.Bit('use_sandboxed_translator'):
+    pnacl_translate = os.path.join(translator_root, 'bin',
+                                   'pnacl-translate' + binext)
+  else:
+    pnacl_translate = binprefix + 'translate' + binext
 
   frontend = env['PNACL_FRONTEND']
   if frontend == 'clang':
@@ -335,9 +342,7 @@ def _SetEnvForPnacl(env, root):
       print 'Not installing', dest
     env.Replace(CC='true', CXX='true', LINK='true', AR='true',
                 RANLIB='true', AS='true', LD='true',
-                STRIP='true', INSTALL=FakeInstall,
-                #TODO(dschuff) remove this when we can translate on arm hw
-                TRANSLATE='true')
+                STRIP='true', INSTALL=FakeInstall)
 
 
 def _SetEnvForSdkManually(env):
@@ -410,7 +415,8 @@ def PNaClGetNNaClEnv(env):
                        CFLAGS=env['CFLAGS'],
                        CXXFLAGS=env['CXXFLAGS'])
   if env.Bit('built_elsewhere'):
-    native_env.Replace(CC='true', CXX='true', LINK='true', LD='true')
+    native_env.Replace(CC='true', CXX='true', LINK='true', LD='true',
+                       AR='true', RANLIB='true')
   return native_env