Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1f012949 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Remove OPTIONS.host_tools" into main am: 092719a4 am: e3296281 

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



Change-Id: Ib512732d8b31d01e42f58f4c4bd8e54c5311fbea
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2edacd65 e3296281

tools/releasetools/common.py

+2 −11
Original line number Diff line number Diff line
@@ -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):