Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1154)

Unified Diff: site_scons/site_tools/naclsdk.py

Issue 331933002: ARM HW bots: looks for FEATURE_VERSION in the right place (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Remove print. Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: site_scons/site_tools/naclsdk.py
diff --git a/site_scons/site_tools/naclsdk.py b/site_scons/site_tools/naclsdk.py
index 4279b95d97e6fff1a86b310e7a95d1f95abed230..7b3f6002c41fee9e7cd90fd4441de056328c8131 100755
--- a/site_scons/site_tools/naclsdk.py
+++ b/site_scons/site_tools/naclsdk.py
@@ -677,7 +677,11 @@ def generate(env):
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')
+ feature_version_root = (
+ os.path.join(os.path.dirname(root), 'pnacl_translator')
+ if (env.Bit('built_elsewhere') and env.Bit('use_sandboxed_translator'))
+ else root)
+ version_file = os.path.join(feature_version_root, 'FEATURE_VERSION')
if os.path.exists(version_file):
with open(version_file, 'r') as fh:
version = int(fh.read())
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698