diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-08 02:03:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-08 02:03:33 +0000 |
| commit | cee4ebf1c3456f48e6b919ba4b681012bd43f227 (patch) | |
| tree | 584a64ee53f88ae67115b32b5d7acac25bd696f8 | |
| parent | cd10355f3ed64dc87633e3c4ae37830f484d20b2 (diff) | |
| parent | 88043be8c37e2013a5ef66c56d0fd6b425206191 (diff) | |
| download | build-cee4ebf1c3456f48e6b919ba4b681012bd43f227.tar.gz | |
Merge changes I674ad741,I908043ba
* changes:
Disable VABC xor if COW isn't compressed
Fix secondary payload generation
| -rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 78c1c2f653..043f6eea41 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -897,6 +897,10 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): (source_info is not None and not source_info.is_vabc_xor): logger.info("VABC XOR Not supported, disabling") OPTIONS.enable_vabc_xor = False + + if OPTIONS.vabc_compression_param == "none": + logger.info("VABC Compression algorithm is set to 'none', disabling VABC xor") + OPTIONS.enable_vabc_xor = False additional_args = [] # Prepare custom images. @@ -927,7 +931,7 @@ def GenerateAbOtaPackage(target_file, output_file, source_file=None): # Metadata to comply with Android OTA package format. metadata = GetPackageMetadata(target_info, source_info) # Generate payload. - payload = PayloadGenerator(OPTIONS.include_secondary, OPTIONS.wipe_user_data) + payload = PayloadGenerator(wipe_user_data=OPTIONS.wipe_user_data) partition_timestamps_flags = [] # Enforce a max timestamp this payload can be applied on top of. |