Track the AVB property name change.
system_avb_hashtree_enable has been renamed to
avb_system_hashtree_enable in commit
3e599ead66
. 'care_map.txt' is missing due
to the change.
Bug: 63142730
Test: `m dist` and check IMAGES/care_map.txt exists in target_files zip.
Change-Id: I60c269b41df844b50353d357bf67c20f15548642
This commit is contained in:
parent
846bd7e00d
commit
3f72176da0
1 changed files with 2 additions and 2 deletions
|
@ -602,12 +602,12 @@ def AddImagesToTargetFiles(filename):
|
|||
for line in lines:
|
||||
if line.strip() == "system" and (
|
||||
"system_verity_block_device" in OPTIONS.info_dict or
|
||||
OPTIONS.info_dict.get("system_avb_hashtree_enable") == "true"):
|
||||
OPTIONS.info_dict.get("avb_system_hashtree_enable") == "true"):
|
||||
assert os.path.exists(system_img_path)
|
||||
care_map_list += GetCareMap("system", system_img_path)
|
||||
if line.strip() == "vendor" and (
|
||||
"vendor_verity_block_device" in OPTIONS.info_dict or
|
||||
OPTIONS.info_dict.get("vendor_avb_hashtree_enable") == "true"):
|
||||
OPTIONS.info_dict.get("avb_vendor_hashtree_enable") == "true"):
|
||||
assert os.path.exists(vendor_img_path)
|
||||
care_map_list += GetCareMap("vendor", vendor_img_path)
|
||||
|
||||
|
|
Loading…
Reference in a new issue