diff options
| author | Daniel Zheng <zhengdaniel@google.com> | 2024-03-21 19:28:30 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-21 19:28:30 +0000 |
| commit | 62ca754567b4e24cdcb4b744265b01a4b8147916 (patch) | |
| tree | 9464aa1438d0669ce259ac4de0fee21e5ee5ba28 | |
| parent | 31a9fee831315547b4807763e6f1627fdee69bd7 (diff) | |
| parent | f3d476ed40d909e87e8070d62a2f04ddfde550bb (diff) | |
| download | build-62ca754567b4e24cdcb4b744265b01a4b8147916.tar.gz | |
Merge "allow command line override" into main
| -rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index c0ff5d2741..0b90b66cf0 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -912,12 +912,13 @@ 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 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 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) # 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 |