StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Pass signing_args to apexer to repack apex"

Browse Source
This commit is contained in:
Baligh Uddin
2020-01-31 13:51:20 +00:00
committed by Gerrit Code Review
parent a4d2d6578e cea6ad1fb0
commit 0a6022e781
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tools/releasetools/apex_utils.py
View File

@@ -50,7 +50,8 @@ class ApexApkSigner(object):
self.key_passwords = key_passwords self.key_passwords = key_passwords
self.codename_to_api_level_map = codename_to_api_level_map self.codename_to_api_level_map = codename_to_api_level_map
def ProcessApexFile(self, apk_keys, payload_key, payload_public_key): def ProcessApexFile(self, apk_keys, payload_key, payload_public_key,
signing_args=None):
"""Scans and signs the apk files and repack the apex """Scans and signs the apk files and repack the apex
Args: Args:
@@ -88,7 +89,8 @@ class ApexApkSigner(object):
logger.info('No apk file has been signed in %s', self.apex_path) logger.info('No apk file has been signed in %s', self.apex_path)
return self.apex_path return self.apex_path
return self.RepackApexPayload(payload_dir, payload_key, payload_public_key) return self.RepackApexPayload(payload_dir, payload_key, payload_public_key,
signing_args)
def ExtractApexPayloadAndSignApks(self, apk_entries, apk_keys): def ExtractApexPayloadAndSignApks(self, apk_entries, apk_keys):
"""Extracts the payload image and signs the containing apk files.""" """Extracts the payload image and signs the containing apk files."""
@@ -116,7 +118,8 @@ class ApexApkSigner(object):
has_signed_apk = True has_signed_apk = True
return payload_dir, has_signed_apk return payload_dir, has_signed_apk
def RepackApexPayload(self, payload_dir, payload_key, payload_public_key): def RepackApexPayload(self, payload_dir, payload_key, payload_public_key,
signing_args=None):
"""Rebuilds the apex file with the updated payload directory.""" """Rebuilds the apex file with the updated payload directory."""
apex_dir = common.MakeTempDir() apex_dir = common.MakeTempDir()
# Extract the apex file and reuse its meta files as repack parameters. # Extract the apex file and reuse its meta files as repack parameters.
@@ -153,20 +156,19 @@ class ApexApkSigner(object):
'--do_not_check_keyname', '--apexer_tool_path', '--do_not_check_keyname', '--apexer_tool_path',
os.getenv('PATH')] os.getenv('PATH')]
for key, val in arguments_dict.items(): for key, val in arguments_dict.items():
repack_cmd.append('--' + key) repack_cmd.extend(['--' + key, val])
repack_cmd.append(val) if signing_args:
repack_cmd.extend(['--signing_args', signing_args])
# optional arguments for apex repacking # optional arguments for apex repacking
manifest_json = os.path.join(apex_dir, 'apex_manifest.json') manifest_json = os.path.join(apex_dir, 'apex_manifest.json')
if os.path.exists(manifest_json): if os.path.exists(manifest_json):
repack_cmd.append('--manifest_json') repack_cmd.extend(['--manifest_json', manifest_json])
repack_cmd.append(manifest_json)
assets_dir = os.path.join(apex_dir, 'assets') assets_dir = os.path.join(apex_dir, 'assets')
if os.path.isdir(assets_dir): if os.path.isdir(assets_dir):
repack_cmd.append('--assets_dir') repack_cmd.extend(['--assets_dir', assets_dir])
repack_cmd.append(assets_dir) repack_cmd.extend([payload_dir, repacked_apex])
if OPTIONS.verbose:
repack_cmd.append(payload_dir) repack_cmd.append('-v')
repack_cmd.append(repacked_apex)
common.RunAndCheckOutput(repack_cmd) common.RunAndCheckOutput(repack_cmd)
return repacked_apex return repacked_apex
@@ -316,7 +318,7 @@ def SignApex(avbtool, apex_data, payload_key, container_key, container_pw,
apk_signer = ApexApkSigner(apex_file, container_pw, apk_signer = ApexApkSigner(apex_file, container_pw,
codename_to_api_level_map) codename_to_api_level_map)
apex_file = apk_signer.ProcessApexFile(apk_keys, payload_key, apex_file = apk_signer.ProcessApexFile(apk_keys, payload_key,
payload_public_key) payload_public_key, signing_args)
# 2a. Extract and sign the APEX_PAYLOAD_IMAGE entry with the given # 2a. Extract and sign the APEX_PAYLOAD_IMAGE entry with the given
# payload_key. # payload_key.

17
tools/releasetools/test_apex_utils.py
View File

@@ -176,3 +176,20 @@ class ApexUtilsTest(test_utils.ReleaseToolsTestCase):
payload_pubkey = common.ExtractAvbPublicKey('avbtool', payload_pubkey = common.ExtractAvbPublicKey('avbtool',
self.payload_key) self.payload_key)
signer.ProcessApexFile(apk_keys, self.payload_key, payload_pubkey) signer.ProcessApexFile(apk_keys, self.payload_key, payload_pubkey)
@test_utils.SkipIfExternalToolsUnavailable()
def test_ApexApkSigner_withSignerHelper(self):
apex_path = os.path.join(self.testdata_dir, 'has_apk.apex')
signer = apex_utils.ApexApkSigner(apex_path, None, None)
apk_keys = {'wifi-service-resources.apk': os.path.join(
self.testdata_dir, 'testkey')}
self.payload_key = os.path.join(self.testdata_dir, 'testkey_RSA4096.key')
payload_pubkey = common.ExtractAvbPublicKey('avbtool', self.payload_key)
signing_helper = os.path.join(self.testdata_dir, 'signing_helper.sh')
os.chmod(signing_helper, 0o700)
payload_signer_args = '--signing_helper_with_files {}'.format(
signing_helper)
signer.ProcessApexFile(apk_keys, self.payload_key, payload_pubkey,
payload_signer_args)