commit cc9c05d5b87a3d0faa0d5907ebd096b4285ca60b
author hungweichen <hungweichen@google.com> Tue Aug 23 05:45:42 2022 +0000
committer hungweichen <hungweichen@google.com> Thu Aug 25 03:30:06 2022 +0000
tree 8cd36d7b49c1afdb4290b40a0e3d539a1f12cba4
parent 22e3b01d7bdfbaf142c51604c2abc6100e59b4c1

Remove HashTreeInfo from verity_utils.py

We are removing VB related functionalities from release tools. This
change removes the hashtreeinfo and generator in verity_utils.py. It
also clears the function args using it.

Bug: 241044073
Test: atest under build/make
Change-Id: Icc298256be6917ffbd40cf4735f8e8092b541c9f

tools/releasetools/non_ab_ota.py

diff --git a/tools/releasetools/non_ab_ota.py b/tools/releasetools/non_ab_ota.py
index 9732cda..6c927ec 100644
--- a/tools/releasetools/non_ab_ota.py
+++ b/tools/releasetools/non_ab_ota.py
@@ -40,12 +40,9 @@
                                         info_dict=source_info,
                                         allow_shared_blocks=allow_shared_blocks)
 
-    hashtree_info_generator = verity_utils.CreateHashtreeInfoGenerator(
-        name, 4096, target_info)
     partition_tgt = common.GetUserImage(name, OPTIONS.target_tmp, target_zip,
                                         info_dict=target_info,
-                                        allow_shared_blocks=allow_shared_blocks,
-                                        hashtree_info_generator=hashtree_info_generator)
+                                        allow_shared_blocks=allow_shared_blocks)
 
     # Check the first block of the source system partition for remount R/W only
     # if the filesystem is ext4.