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

Merge "Remove OPTIONS.host_tools" into main am: 092719a471

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2688229

Change-Id: I0b32673a99a1104480e38168119e1a641c476fe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-08-02 02:49:42 +00:00
committed by Automerger Merge Worker
parent b38245f203 092719a471
commit e3296281f9
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tools/releasetools/common.py
View File

@@ -96,7 +96,6 @@ class Options(object):
self.cache_size = None
self.stash_threshold = 0.8
self.logfile = None
self.host_tools = {}
self.sepolicy_name = 'sepolicy.apex'
@@ -225,23 +224,15 @@ def InitLogging():
logging.config.dictConfig(config)
def SetHostToolLocation(tool_name, location):
OPTIONS.host_tools[tool_name] = location
def FindHostToolPath(tool_name):
"""Finds the path to the host tool.
Args:
tool_name: name of the tool to find
Returns:
path to the tool if found under either one of the host_tools map or under
the same directory as this binary is located at. If not found, tool_name
is returned.
path to the tool if found under the same directory as this binary is located at. If not found,
tool_name is returned.
"""
if tool_name in OPTIONS.host_tools:
return OPTIONS.host_tools[tool_name]
my_dir = os.path.dirname(os.path.realpath(sys.argv[0]))
tool_path = os.path.join(my_dir, tool_name)
if os.path.exists(tool_path):