Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 48ae05ea authored by Tao Bao's avatar Tao Bao
Browse files

Track the AVB property name change. 

system_avb_hashtree_enable has been renamed to
avb_system_hashtree_enable in commit
3e599ead. '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 3f72176d)
parent 47e137f3

tools/releasetools/add_img_to_target_files.py

+2 −2
Original line number Diff line number Diff line
@@ -599,12 +599,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)