Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" am: b69bcdec29
am: cdd4c44b43
Original change: https://android-review.googlesource.com/c/platform/build/+/1976677 Change-Id: I9eadb6e37d4b7c4d2fc9dc53107655e9046b6e9f
This commit is contained in:
commit
e1c32a82ed
1 changed files with 5 additions and 0 deletions
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue