commit 707569711b85cf0a92136a66aeddcc7cd940eb5e
author zhangyongpeng <zhangyongpeng@xiaomi.com> Wed Apr 12 15:31:33 2023 +0800
committer zhangyongpeng <zhangyongpeng@xiaomi.corp-partner.google.com> Fri Apr 14 12:12:47 2023 +0800
tree 7301fc9c3f85585924a93175f563699442ee6c7d
parent 64bfc41359f8502569feee49c892d4f0f0399798

Try with search_path for some avb path args

If we can't find relative signing_helper path, try with the OPTIONS.search_path dir prefix， and integrate the avb_*_key_path for the same logic.

Test: Build && releasetools_test

Signed-off-by: zhangyongpeng <zhangyongpeng@xiaomi.com>
Change-Id: Ifb1096ddea90693668f3344eb242bf9725113d11

tools/releasetools/verity_utils.py

diff --git a/tools/releasetools/verity_utils.py b/tools/releasetools/verity_utils.py
index 755241d..dddb7f4 100644
--- a/tools/releasetools/verity_utils.py
+++ b/tools/releasetools/verity_utils.py
@@ -141,11 +141,7 @@
     self.footer_type = footer_type
     self.avbtool = avbtool
     self.algorithm = algorithm
-    self.key_path = key_path
-    if key_path and not os.path.exists(key_path) and OPTIONS.search_path:
-      new_key_path = os.path.join(OPTIONS.search_path, key_path)
-      if os.path.exists(new_key_path):
-        self.key_path = new_key_path
+    self.key_path = common.ResolveAVBSigningPathArgs(key_path)
 
     self.salt = salt
     self.signing_args = signing_args