Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" am: b69bcdec29

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

Change-Id: I9cb8053980392cb659e882608d8fcd92e3f4061a
This commit is contained in:
Kelvin Zhang 2022-02-10 04:55:12 +00:00 committed by Automerger Merge Worker
commit cdd4c44b43

View file

@ -379,6 +379,11 @@ class VerifiedBootVersion2VerityImageBuilder(VerityImageBuilder):
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.salt = salt
self.signing_args = signing_args
self.image_size = None