From 6bb647fb8548612bbd4bcd8dbbf30a7e7e75a7c0 Mon Sep 17 00:00:00 2001 From: Kelvin Zhang Date: Mon, 19 Apr 2021 16:44:56 -0400 Subject: [PATCH] Enable support for verity writes for VABC targets We already added support on device to write verity. Flipping a flag in ota generation tools to enable verity. Test: th && running OTA repeatedly on bramble Change-Id: Id1639f644eb8c23f97e171264702a7872f41411a --- tools/releasetools/ota_from_target_files.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 02b2b4de0..94dbd4ef8 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -1051,15 +1051,6 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): "META/ab_partitions.txt is required for ab_update." 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") - 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: assert "ab_partitions" in OPTIONS.info_dict, \ "META/ab_partitions.txt is required for ab_update."