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

Merge "Don't disable verity if VABC is disabled"

Browse Source
This commit is contained in:
Treehugger Robot
2021-04-02 22:52:45 +00:00
committed by Gerrit Code Review
parent 4ac1818cde 50dc1b88b7
commit d2170430fe
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/ota_from_target_files.py
View File

@@ -1052,8 +1052,10 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
target_info = common.BuildInfo(OPTIONS.target_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")
if vendor_prop and \
vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true":
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