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

Commit 55625564 authored by Tao Bao's avatar Tao Bao Committed by android-build-merger
Browse files

Merge "Track the AVB property name change." am: c4516153 

am: fcc2cf6c

Change-Id: I9bbed4c45961f2d3fa775b8b977ae58bbaae33ff
parents 8012c195 fcc2cf6c

tools/releasetools/add_img_to_target_files.py

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