diff options
| author | Kelvin Zhang <zhangkelvin@google.com> | 2023-03-07 14:35:42 -0800 |
|---|---|---|
| committer | Kelvin Zhang <zhangkelvin@google.com> | 2023-03-07 14:35:42 -0800 |
| commit | 49fadf41ebb09282748ebdf4f209bc0a2523d268 (patch) | |
| tree | f2e22727473b20b0eda49b3d3dcd9acbaffdc850 | |
| parent | 0452128f09de2280333fc9716330145a27c84887 (diff) | |
| download | build-49fadf41ebb09282748ebdf4f209bc0a2523d268.tar.gz | |
Fix secondary payload generation
Secondary payload is already handled by creating a new instance of
PayloadGenerator, when creating PayloadGenerator for primary payload,
we should not include the OPTIONS.secondary parameter.
Bug: 270100752
Test: ota_from_target_files --include_secondary
Change-Id: I908043bad11aa6d47dc4dc9b61da460fcfa4f0b9
| -rwxr-xr-x | tools/releasetools/ota_from_target_files.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/releasetools/ota_from_target_files.py b/tools/releasetools/ota_from_target_files.py index 97fbd510cb..88adffb46b 100755 --- a/tools/releasetools/ota_from_target_files.py +++ b/tools/releasetools/ota_from_target_files.py @@ -893,6 +893,7 @@ 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 + additional_args = [] # Prepare custom images. @@ -923,7 +924,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. |