tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix non-AB OTA signing issue

Browse source 
After aosp/2201756 , caller must explicitly pass signing key as a
parameter to FinalizeMetadata . We forgot to update non_ab.py ,
therefore causing non-AB OTAs to be unsigned.

Test: th
Bug: 265895599
Change-Id: Ia54b1105f37b6574742b9b55d715fc9c61c223eb
This commit is contained in:
Kelvin Zhang 2023-01-20 10:18:11 -08:00
parent 9f63b29083
commit f80e886273
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/releasetools/non_ab_ota.py
View file

@ -282,7 +282,7 @@ endif;
needed_property_files = ( needed_property_files = (
NonAbOtaPropertyFiles(), NonAbOtaPropertyFiles(),
) )
FinalizeMetadata(metadata, staging_file, output_file, needed_property_files) FinalizeMetadata(metadata, staging_file, output_file, needed_property_files, package_key=OPTIONS.package_key)
def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_file): def WriteBlockIncrementalOTAPackage(target_zip, source_zip, output_file):
@ -537,7 +537,7 @@ endif;
needed_property_files = ( needed_property_files = (
NonAbOtaPropertyFiles(), NonAbOtaPropertyFiles(),
) )
FinalizeMetadata(metadata, staging_file, output_file, needed_property_files) FinalizeMetadata(metadata, staging_file, output_file, needed_property_files, package_key=OPTIONS.package_key)
def GenerateNonAbOtaPackage(target_file, output_file, source_file=None): def GenerateNonAbOtaPackage(target_file, output_file, source_file=None):

2
tools/releasetools/ota_utils.py
View file

@ -132,8 +132,10 @@ def FinalizeMetadata(metadata, input_file, output_file, needed_property_files=No
# Re-sign the package after updating the metadata entry. # Re-sign the package after updating the metadata entry.
if no_signing: if no_signing:
logger.info(f"Signing disabled for output file {output_file}")
shutil.copy(prelim_signing, output_file) shutil.copy(prelim_signing, output_file)
else: else:
logger.info(f"Signing the output file {output_file} with key {package_key}")
SignOutput(prelim_signing, output_file, package_key, pw) SignOutput(prelim_signing, output_file, package_key, pw)
# Reopen the final signed zip to double check the streaming metadata. # Reopen the final signed zip to double check the streaming metadata.