Merge "sign_target_files_apks: Fix password encrypted keys handle" (ec952237) · Commits · e / os / android_build

tools/releasetools/apex_utils.py

+6 −3

Original line number	Diff line number	Diff line
		@@ -49,6 +49,9 @@ class ApexApkSigner(object):

		def __init__(self, apex_path, key_passwords, codename_to_api_level_map):
		self.apex_path = apex_path
		if not key_passwords:
		self.key_passwords = dict()
		else:
		self.key_passwords = key_passwords
		self.codename_to_api_level_map = codename_to_api_level_map
		self.debugfs_path = os.path.join(
		@@ -124,7 +127,7 @@ class ApexApkSigner(object):
		# signed apk file.
		unsigned_apk = common.MakeTempFile()
		os.rename(apk_path, unsigned_apk)
		common.SignFile(unsigned_apk, apk_path, key_name, self.key_passwords,
		common.SignFile(unsigned_apk, apk_path, key_name, self.key_passwords.get(key_name),
		codename_to_api_level_map=self.codename_to_api_level_map)
		has_signed_apk = True
		return payload_dir, has_signed_apk
		@@ -371,7 +374,7 @@ def SignApex(avbtool, apex_data, payload_key, container_key, container_pw,
		aligned_apex,
		signed_apex,
		container_key,
		container_pw,
		container_pw.get(container_key),
		codename_to_api_level_map=codename_to_api_level_map,
		extra_signapk_args=extra_signapk_args)

+1 −1

Original line number	Diff line number	Diff line
		@@ -515,7 +515,7 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
		data,
		payload_key,
		container_key,
		key_passwords[container_key],
		key_passwords,
		apk_keys,
		codename_to_api_level_map,
		no_hashtree=True,