commit 05a3f680f70c4b3987f78ec4e978409024ba6329
author Kelvin Zhang <zhangkelvin@google.com> Fri Jan 29 14:38:24 2021 -0500
committer Kelvin Zhang <zhangkelvin@google.com> Tue Feb 02 14:24:54 2021 -0500
tree 913ccda34da34feff852200b1a7dce276c45cf62
parent 553efcaae24fc85ff636ec33be0e1182bef56f07

Fix test failures due to binaries not found in PATH

Test: rm `where deapexer` && mm otapackage

Change-Id: I0b742f26ae984729b97bf796aa3ed9335b316369

tools/releasetools/apex_utils.py

diff --git a/tools/releasetools/apex_utils.py b/tools/releasetools/apex_utils.py
index 3177fa0..644b92a 100644
--- a/tools/releasetools/apex_utils.py
+++ b/tools/releasetools/apex_utils.py
@@ -545,7 +545,7 @@
     debugfs_path = os.path.join(OPTIONS.search_path, "bin", "debugfs_static")
   deapexer = 'deapexer'
   if OPTIONS.search_path:
-    deapexer_path = os.path.join(OPTIONS.search_path, "deapexer")
+    deapexer_path = os.path.join(OPTIONS.search_path, "bin", "deapexer")
     if os.path.isfile(deapexer_path):
       deapexer = deapexer_path
   for apex_filename in os.listdir(target_dir):