StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add SetHostToolLocation.

Browse Source 
Add common.SetHostToolLocation so that, when calling
various common.Run* functions, replace the first
argument with previously set paths. This is needed
when the script is executed in a Soong sandbox.

Bug: 161563386
Test: pass
Change-Id: If3b40b518fc7fe068677d39d604e3f6578a12ea3
This commit is contained in:
Yifan Hong
2020-07-29 17:51:55 -07:00
parent ad970e69f3
commit 8e332ff3a7
1 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/releasetools/common.py
View File

@@ -96,6 +96,7 @@ class Options(object):
self.cache_size = None self.cache_size = None
self.stash_threshold = 0.8 self.stash_threshold = 0.8
self.logfile = None self.logfile = None
self.host_tools = {}
OPTIONS = Options() OPTIONS = Options()
@@ -213,6 +214,10 @@ def InitLogging():
logging.config.dictConfig(config) logging.config.dictConfig(config)
def SetHostToolLocation(tool_name, location):
OPTIONS.host_tools[tool_name] = location
def Run(args, verbose=None, **kwargs): def Run(args, verbose=None, **kwargs):
"""Creates and returns a subprocess.Popen object. """Creates and returns a subprocess.Popen object.
@@ -234,6 +239,14 @@ def Run(args, verbose=None, **kwargs):
kwargs['stderr'] = subprocess.STDOUT kwargs['stderr'] = subprocess.STDOUT
if 'universal_newlines' not in kwargs: if 'universal_newlines' not in kwargs:
kwargs['universal_newlines'] = True kwargs['universal_newlines'] = True
# If explicitly set host tool location before, use that location to avoid
# PATH violation. Make a copy of args in case client relies on the content
# of args later.
if args and args[0] in OPTIONS.host_tools:
args = args[:]
args[0] = OPTIONS.host_tools[args[0]]
# Don't log any if caller explicitly says so. # Don't log any if caller explicitly says so.
if verbose: if verbose:
logger.info(" Running: \"%s\"", " ".join(args)) logger.info(" Running: \"%s\"", " ".join(args))