Don't disable verity if VABC is disabled
Test: th Change-Id: Icef5315047aa783219e1dcb6678adaa084626e52
This commit is contained in:
@@ -1052,8 +1052,10 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
|
|||||||
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")
|
vendor_prop = source_info.info_dict.get("vendor.build.prop")
|
||||||
if vendor_prop and \
|
vabc_used = vendor_prop and \
|
||||||
vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true":
|
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
|
# TODO(zhangkelvin) Remove this once FEC on VABC is supported
|
||||||
logger.info("Virtual AB Compression enabled, disabling FEC")
|
logger.info("Virtual AB Compression enabled, disabling FEC")
|
||||||
OPTIONS.disable_fec_computation = True
|
OPTIONS.disable_fec_computation = True
|
||||||
|
Reference in New Issue
Block a user