| commit | 6014c0f9109c62f7c1cd8a1761afb27e00a24737 | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | Wed Jan 17 08:16:23 2024 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Jan 17 08:16:23 2024 +0000 |
| tree | 6cbc7c03c780753c4c0195037180fb37585ff392 | |
| parent | 51aab38cd3fba4e0fa8b6b36fb8f5b9cee0c03ad [diff] | |
| parent | 0562b343d1470da6441708570eeec752f8baeed8 [diff] |
Merge "Remove unnecessary calling of PayloadGenerator" into main am: 0562b343d1 Original change: https://android-review.googlesource.com/c/platform/build/+/2900888 Change-Id: Id3cd26becccb7e763b12d7a9452d369a3b6bb3b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tools/releasetools/merge_ota.py b/tools/releasetools/merge_ota.py index 24d9ea9..fb5957a 100644 --- a/tools/releasetools/merge_ota.py +++ b/tools/releasetools/merge_ota.py
@@ -243,8 +243,6 @@ # Get signing keys key_passwords = common.GetKeyPasswords([args.package_key]) - generator = PayloadGenerator() - apex_info_bytes = ApexInfo(file_paths) with tempfile.NamedTemporaryFile() as unsigned_payload: