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

Merge "Track the AVB property name change."

Browse Source
This commit is contained in:
Treehugger Robot
2017-07-07 23:28:30 +00:00
committed by Gerrit Code Review
parent c86c8502ac 3f72176da0
commit c45161536f
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/add_img_to_target_files.py
View File

@@ -602,12 +602,12 @@ def AddImagesToTargetFiles(filename):
for line in lines: for line in lines:
if line.strip() == "system" and ( if line.strip() == "system" and (
"system_verity_block_device" in OPTIONS.info_dict or "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) assert os.path.exists(system_img_path)
care_map_list += GetCareMap("system", system_img_path) care_map_list += GetCareMap("system", system_img_path)
if line.strip() == "vendor" and ( if line.strip() == "vendor" and (
"vendor_verity_block_device" in OPTIONS.info_dict or "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) assert os.path.exists(vendor_img_path)
care_map_list += GetCareMap("vendor", vendor_img_path) care_map_list += GetCareMap("vendor", vendor_img_path)