Revert "allow command line override"

This reverts commit f3d476ed40.

Reason for revert: b/330767621

Change-Id: Ia0b8ec3f177ae74c03d7cb4e568e44149b125617
This commit is contained in:
Daniel Zheng 2024-03-21 21:08:22 +00:00 committed by Gerrit Code Review
parent f3d476ed40
commit 02393ee106

View file

@ -912,13 +912,12 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None):
# and install time performance. All OTA's with
# both the source build and target build with VIRTUAL_AB_COW_VERSION = 3
# can support the new format. Otherwise, fallback on older versions
if not OPTIONS.vabc_cow_version:
if not source_info.vabc_cow_version or not target_info.vabc_cow_version:
logger.info("Source or Target doesn't have VABC_COW_VERSION specified, default to version 2")
OPTIONS.vabc_cow_version = 2
elif source_info.vabc_cow_version != target_info.vabc_cow_version:
logger.info("Source and Target have different cow VABC_COW_VERSION specified, default to minimum version")
OPTIONS.vabc_cow_version = min(source_info.vabc_cow_version, target_info.vabc_cow_version)
if OPTIONS.vabc_cow_version:
logger.info("Source or Target doesn't have VABC_COW_VERSION specified, using version: " + OPTIONS.vabc_cow_version)
# Virtual AB Compression was introduced in Androd S.
# Later, we backported VABC to Android R. But verity support was not
# backported, so if VABC is used and we are on Android R, disable