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

Merge "sign_target_files_apks: replacing GKI signing args completely"

Browse Source
This commit is contained in:
Treehugger Robot
2021-05-11 07:30:16 +00:00
committed by Gerrit Code Review
parent a530481db1 bcae74def7
commit dcadb68011
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
tools/releasetools/sign_target_files_apks.py
View File

@@ -1033,9 +1033,8 @@ def ReplaceGkiSigningKey(misc_info):
extra_args = OPTIONS.gki_signing_extra_args extra_args = OPTIONS.gki_signing_extra_args
if extra_args: if extra_args:
print('Setting extra GKI signing args: "%s"' % (extra_args)) print('Setting GKI signing args: "%s"' % (extra_args))
misc_info["gki_signing_signature_args"] = ( misc_info["gki_signing_signature_args"] = extra_args
misc_info.get("gki_signing_signature_args", '') + ' ' + extra_args)
def BuildKeyMap(misc_info, key_mapping_options): def BuildKeyMap(misc_info, key_mapping_options):

2
tools/releasetools/test_sign_target_files_apks.py
View File

@@ -602,7 +602,7 @@ name="apex.apexd_test_different_app.apex" public_key="system/apex/apexd/apexd_te
expected_dict = { expected_dict = {
'gki_signing_key_path': 'release_gki_key', 'gki_signing_key_path': 'release_gki_key',
'gki_signing_algorithm': 'release_gki_algorithm', 'gki_signing_algorithm': 'release_gki_algorithm',
'gki_signing_signature_args': 'default_gki_signature_args release_gki_signature_extra_args', 'gki_signing_signature_args': 'release_gki_signature_extra_args',
} }
ReplaceGkiSigningKey(misc_info) ReplaceGkiSigningKey(misc_info)
self.assertDictEqual(expected_dict, misc_info) self.assertDictEqual(expected_dict, misc_info)