commit 97a5afe0f3a2ab6ee41176863452e00e66820f83
author Kelvin Zhang <zhangkelvin@google.com> Tue Jun 27 10:30:48 2023 -0700
committer Kelvin Zhang <zhangkelvin@google.com> Tue Jun 27 10:30:48 2023 -0700
tree 75e8685704370acf7052c0c18f33850d599b90d3
parent 571cd077964f819f3c0b6d6837e187d82104a74c

Fix test flake

Test: th
Bug: 289013326
Change-Id: Ib233978ff861b010bdc3bd1a02ea9baefe6a3489

tools/releasetools/common.py

diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py
index 5d102cd..39e1bdd 100644
--- a/tools/releasetools/common.py
+++ b/tools/releasetools/common.py
@@ -1424,9 +1424,10 @@
   def ResolveBinaryPath(path):
     if os.path.exists(path):
       return path
-    new_path = os.path.join(OPTIONS.search_path, path)
-    if os.path.exists(new_path):
-      return new_path
+    if OPTIONS.search_path:
+      new_path = os.path.join(OPTIONS.search_path, path)
+      if os.path.exists(new_path):
+        return new_path
     raise ExternalError(
         "Failed to find {}".format(new_path))