commit 779c960d9e1ebbc753138588da985cd64db9a3cd
author Virajitha Daibala <daibala.virajitha@sony.com> Wed Dec 20 12:44:38 2023 +0900
committer Håkan Kvist <hakan.kvist@sony.com> Mon Jan 08 14:30:00 2024 +0100
tree 521c981d39b413ad848803975bd10ea0c9cf0f1a
parent 88b268f4b222d5d78768ff879cbadad9307d75f3

Remove unnecessary calling of PayloadGenerator

PayloadGenerator object is created twice, introduced in:
1f93ce20c5a5f3e7c2f6b5e1f9fdc4d2572220cc

Remove this extra call.

Test: atest --host releasetools_test
Change-Id: I7701542f7f53c9295a44fc23f634d863ab4cfc52

tools/releasetools/merge_ota.py

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: