commit 22e3b01d7bdfbaf142c51604c2abc6100e59b4c1
author hungweichen <hungweichen@google.com> Fri Aug 19 06:35:43 2022 +0000
committer hungweichen <hungweichen@google.com> Wed Aug 24 06:37:12 2022 +0000
tree 9a29ebe5bac518ab71ccfdbdd8bb7b67b1f021ce
parent dd3fca09f6bbceb3576567411e54b856c6f408c4

Remove verity keys from info_dict

We are removing VB support from release tools. This change aims to
remove verity keys in info_dict generated by common.LOADINFODICT

Bug: 242672222
Test: atest under build/make
Change-Id: I9268cb113c2c0bd11ce85b8485e5a4605bdbdca0

tools/releasetools/ota_from_target_files.py

diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py
index 5384699..bf98de6 100755
--- a/tools/releasetools/ota_from_target_files.py
+++ b/tools/releasetools/ota_from_target_files.py
@@ -1289,8 +1289,7 @@
   # If dm-verity is supported for the device, copy contents of care_map
   # into A/B OTA package.
   target_zip = zipfile.ZipFile(target_file, "r", allowZip64=True)
-  if (target_info.get("verity") == "true" or
-          target_info.get("avb_enable") == "true"):
+  if target_info.get("avb_enable") == "true":
     care_map_list = [x for x in ["care_map.pb", "care_map.txt"] if
                      "META/" + x in target_zip.namelist()]