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

Allow extra_apex_payload_key to take multiple names at once

Browse Source 
When running tests, we might need to add many
extra_payload_keys. Currently we have to add --extra_apex_payload_key
for each key pair we pass, resulting in extremely long argument list.

Test: th
Bug: 239991438
Change-Id: I3e5f9d76c7f45822fb986b603dc089407c35b76b
This commit is contained in:
Kelvin Zhang
2022-07-25 16:12:30 -07:00
parent 2c3c189da7
commit 085b6f3e84
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasetools/sign_target_files_apks.py
View File

@@ -27,7 +27,7 @@ Usage: sign_target_files_apks [flags] input_target_files output_target_files
apkcerts.txt file, or the container key for an APEX. Option may be apkcerts.txt file, or the container key for an APEX. Option may be
repeated to give multiple extra packages. repeated to give multiple extra packages.
--extra_apex_payload_key <name=key> --extra_apex_payload_key <name,name,...=key>
Add a mapping for APEX package name to payload signing key, which will Add a mapping for APEX package name to payload signing key, which will
override the default payload signing key in apexkeys.txt. Note that the override the default payload signing key in apexkeys.txt. Note that the
container key should be overridden via the `--extra_apks` flag above. container key should be overridden via the `--extra_apks` flag above.
@@ -1380,8 +1380,9 @@ def main(argv):
for n in names: for n in names:
OPTIONS.extra_apks[n] = key OPTIONS.extra_apks[n] = key
elif o == "--extra_apex_payload_key": elif o == "--extra_apex_payload_key":
apex_name, key = a.split("=") apex_names, key = a.split("=")
OPTIONS.extra_apex_payload_keys[apex_name] = key for name in apex_names:
OPTIONS.extra_apex_payload_keys[name] = key
elif o == "--skip_apks_with_path_prefix": elif o == "--skip_apks_with_path_prefix":
# Check the prefix, which must be in all upper case. # Check the prefix, which must be in all upper case.
prefix = a.split('/')[0] prefix = a.split('/')[0]