tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Allow extra_apex_payload_key to take multiple names at once" am: d024518e1e

Browse source 
Original change: https://android-review.googlesource.com/c/platform/build/+/2164515

Change-Id: I0d2545f758d7469cf3a68ccf505a6183306630b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2022-07-27 02:04:03 +00:00 committed by Automerger Merge Worker
commit 488525a889
1 changed files with 4 additions and 3 deletions
Show stats 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]