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

Merge "Fix test flake" am: 59f99b31eb am: b56b3b7b38 am: 01aeb2872c

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

Change-Id: Iade474f2717f72ee790965de8cfa4bd17d56347d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-06-28 03:44:24 +00:00
committed by Automerger Merge Worker
parent 65e23a90b3 01aeb2872c
commit 886edb56eb
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasetools/common.py
View File

@@ -1424,9 +1424,10 @@ def ResolveAVBSigningPathArgs(split_args):
def ResolveBinaryPath(path): def ResolveBinaryPath(path):
if os.path.exists(path): if os.path.exists(path):
return path return path
new_path = os.path.join(OPTIONS.search_path, path) if OPTIONS.search_path:
if os.path.exists(new_path): new_path = os.path.join(OPTIONS.search_path, path)
return new_path if os.path.exists(new_path):
return new_path
raise ExternalError( raise ExternalError(
"Failed to find {}".format(new_path)) "Failed to find {}".format(new_path))