ARM HW bots: looks for FEATURE_VERSION in the right place

site_scons/site_tools/naclsdk.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 """NaCl SDK tool SCons."""
 
 import __builtin__
 import re
 import os
@@ skipping 660 matching lines @@
       )
   env.Append(SCANNERS=ldscript_scanner)
 
   # Scons tests can check this version number to decide whether to
   # enable tests for toolchain bug fixes or new features.  See
   # description in pnacl/build.sh.
   if 'toolchain_feature_version' in SCons.Script.ARGUMENTS:
     version = int(SCons.Script.ARGUMENTS['toolchain_feature_version'])
   else:
     version_file = os.path.join(root, 'FEATURE_VERSION')
+    # There is no pnacl_newlib toolchain on ARM, only a pnacl_translator, so
+    # use that if necessary. Otherwise use it if we are doing sandboxed
+    # translation.
+    if not os.path.exists(version_file) or env.Bit('use_sandboxed_translator'):
+      version_file = os.path.join(os.path.dirname(root), 'pnacl_translator',
+                                  'FEATURE_VERSION')
     if os.path.exists(version_file):
       with open(version_file, 'r') as fh:
         version = int(fh.read())
     else:
       version = 0
   env.Replace(TOOLCHAIN_FEATURE_VERSION=version)