StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Icc298256,I9268cb11,I446a0b16,I347447eb,Iaae39e4c, ...

Browse Source 
* changes:
  Remove HashTreeInfo from verity_utils.py
  Remove verity keys from info_dict
  Remove replace verity key args
  Remove unused args from common.py
  Clean up unused code for VB in verity_utils.py
  Remove verity related props from build_image.py
This commit is contained in:
Hung-Wei Chen
2022-08-30 07:10:23 +00:00
committed by Gerrit Code Review
parent 1eb2dc871c cc9c05d5b8
commit be469cf909
12 changed files with 29 additions and 920 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/releasetools/ota_from_target_files.py
View File

@@ -1227,8 +1227,7 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
# 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()]