StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix prebuilt boot image hermetic build" into main am: 5f4a51ef66

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2813275

Change-Id: I6a4f9567d37089af660d49b2c5b24a148a89fb6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2023-11-01 18:24:06 +00:00
committed by Automerger Merge Worker
parent 27bf1543a3 5f4a51ef66
commit 7bf3aab4ea
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/releasetools/common.py
View File

@@ -1908,8 +1908,11 @@ def _SignBootableImage(image_path, prebuilt_name, partition_name,
for filename in ["kernel", "ramdisk", "vendor_ramdisk00"]: for filename in ["kernel", "ramdisk", "vendor_ramdisk00"]:
path = os.path.join(tmpdir, filename) path = os.path.join(tmpdir, filename)
if os.path.exists(path) and os.path.getsize(path): if os.path.exists(path) and os.path.getsize(path):
print("Using {} as salt for avb footer of {}".format(
filename, partition_name))
with open(path, "rb") as fp: with open(path, "rb") as fp:
salt = sha256(fp.read()).hexdigest() salt = sha256(fp.read()).hexdigest()
break
AppendAVBSigningArgs(cmd, partition_name, salt) AppendAVBSigningArgs(cmd, partition_name, salt)
args = info_dict.get("avb_" + partition_name + "_add_hash_footer_args") args = info_dict.get("avb_" + partition_name + "_add_hash_footer_args")
if args and args.strip(): if args and args.strip():