Fix prebuilt boot image hermetic build
Break when we find a working salt, certain devices have boot image containing both the kernel and ramdisk, resulting in the ramdisk being used as salt. Since core/Makefile uses kernel as salt, update python code to match. Bug: 293313353 Test: th Change-Id: I68b5a8c2f0747ddf68f775bc2a6c5db46eb7eb64
This commit is contained in:
@@ -1908,8 +1908,11 @@ def _SignBootableImage(image_path, prebuilt_name, partition_name,
|
||||
for filename in ["kernel", "ramdisk", "vendor_ramdisk00"]:
|
||||
path = os.path.join(tmpdir, filename)
|
||||
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:
|
||||
salt = sha256(fp.read()).hexdigest()
|
||||
break
|
||||
AppendAVBSigningArgs(cmd, partition_name, salt)
|
||||
args = info_dict.get("avb_" + partition_name + "_add_hash_footer_args")
|
||||
if args and args.strip():
|
||||
|
Reference in New Issue
Block a user