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

Merge "Revert "Enable support for verity writes for VABC targets"" am: 87cfdce392 am: c06f3199fc

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1685709

Change-Id: Ibad0f57d1094bc50da789076f2754fb495125b2a
This commit is contained in:
Treehugger Robot
2021-04-24 04:27:57 +00:00
committed by Automerger Merge Worker
parent 9488811f77 c06f3199fc
commit 756437a802
1 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/releasetools/ota_from_target_files.py
View File

@@ -1051,6 +1051,15 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
"META/ab_partitions.txt is required for ab_update." "META/ab_partitions.txt is required for ab_update."
target_info = common.BuildInfo(OPTIONS.target_info_dict, OPTIONS.oem_dicts) target_info = common.BuildInfo(OPTIONS.target_info_dict, OPTIONS.oem_dicts)
source_info = common.BuildInfo(OPTIONS.source_info_dict, OPTIONS.oem_dicts) source_info = common.BuildInfo(OPTIONS.source_info_dict, OPTIONS.oem_dicts)
vendor_prop = source_info.info_dict.get("vendor.build.prop")
vabc_used = vendor_prop and \
vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true" and \
not OPTIONS.disable_vabc
if vabc_used:
# TODO(zhangkelvin) Remove this once FEC on VABC is supported
logger.info("Virtual AB Compression enabled, disabling FEC")
OPTIONS.disable_fec_computation = True
OPTIONS.disable_verity_computation = True
else: else:
assert "ab_partitions" in OPTIONS.info_dict, \ assert "ab_partitions" in OPTIONS.info_dict, \
"META/ab_partitions.txt is required for ab_update." "META/ab_partitions.txt is required for ab_update."