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

Disable FEC computation for VABC

Browse Source 
Test: treehugger, generate a package and make sure --disable_fec is
passed to delta_generator

Change-Id: If256af90b11a7fa03299c1272466d35ef3798a24
This commit is contained in:
Kelvin Zhang
2020-11-03 13:42:46 -05:00
parent 0806152b83
commit 31233e5922
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/ota_from_target_files.py
View File

@@ -972,6 +972,12 @@ 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")
if vendor_prop and \
vendor_prop.GetProp("ro.virtual_ab.compression.enabled") == "true":
# TODO(zhangkelvin) Remove this once FEC on VABC is supported
logger.info("Virtual AB Compression enabled, disabling FEC")
OPTIONS.disable_fec_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."
@@ -998,7 +1004,7 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
# Target_file may have been modified, reparse ab_partitions # Target_file may have been modified, reparse ab_partitions
with zipfile.ZipFile(target_file, allowZip64=True) as zfp: with zipfile.ZipFile(target_file, allowZip64=True) as zfp:
target_info.info_dict['ab_partitions'] = zfp.read( target_info.info_dict['ab_partitions'] = zfp.read(
AB_PARTITIONS).encode().strip().split("\n") AB_PARTITIONS).decode().strip().split("\n")
# Metadata to comply with Android OTA package format. # Metadata to comply with Android OTA package format.
metadata = GetPackageMetadata(target_info, source_info) metadata = GetPackageMetadata(target_info, source_info)