tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Track the AVB property name change.

Browse source 
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
(cherry picked from commit 3f72176da0)
This commit is contained in:
Tao Bao 2017-06-29 15:11:44 -07:00
parent 47e137f357
commit 48ae05ea77
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/releasetools/add_img_to_target_files.py
View file

@ -599,12 +599,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)