openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "sign_target_files_apks: replacing GKI signing args completely" am: dcadb68011 am: 6fd4524d0d am: 2c18f4b84b 

Original change: https://android-review.googlesource.com/c/platform/build/+/1700885

Change-Id: Ief6b3f276eb8710a4089600f371b5bc87b1e1a78
This commit is contained in:
Treehugger Robot 2021-05-11 14:08:09 +00:00 committed by Automerger Merge Worker
parent 216c762826 2c18f4b84b
commit 095b57327d
2 changed files with 3 additions and 4 deletions
Show Stats 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
if extra_args:
print('Setting extra GKI signing args: "%s"' % (extra_args))
misc_info["gki_signing_signature_args"] = (
misc_info.get("gki_signing_signature_args", '') + ' ' + extra_args)
print('Setting GKI signing args: "%s"' % (extra_args))
misc_info["gki_signing_signature_args"] = extra_args
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 = {
'gki_signing_key_path': 'release_gki_key',
'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)
self.assertDictEqual(expected_dict, misc_info)