From 02393ee106fdf9feb1b5d2d3532ee1418008a60c Mon Sep 17 00:00:00 2001 From: Daniel Zheng Date: Thu, 21 Mar 2024 21:08:22 +0000 Subject: [PATCH] Revert "allow command line override" This reverts commit f3d476ed40d909e87e8070d62a2f04ddfde550bb. Reason for revert: b/330767621 Change-Id: Ia0b8ec3f177ae74c03d7cb4e568e44149b125617 --- tools/releasetools/ota_from_target_files.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 0b90b66cf0..c0ff5d2741 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -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: - OPTIONS.vabc_cow_version = 2 - elif source_info.vabc_cow_version != target_info.vabc_cow_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) + 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) # 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