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

releasetools: Ignore nonexistent APEX overrides.

Browse Source 
This allows sharing the same signing config on different target_files
zips. Nonexistent APEX will be ignored with a warning.

Bug: 137249701
Test: Run sign_target_files_apks with APEX overrides.
Change-Id: I2bad0f5c00753ed36ec5ae3431c7dc2ff1fc3e9c
Merged-In: I2bad0f5c00753ed36ec5ae3431c7dc2ff1fc3e9c
(cherry picked from commit b369c7226a)
This commit is contained in:
Tao Bao
2019-07-11 11:52:52 -07:00
parent 3f7c416650
commit 3422309d6d
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
tools/releasetools/sign_target_files_apks.py
View File

@@ -188,6 +188,9 @@ def GetApexKeys(keys_info, key_map):
for apex, key in OPTIONS.extra_apex_payload_keys.items(): for apex, key in OPTIONS.extra_apex_payload_keys.items():
if not key: if not key:
key = 'PRESIGNED' key = 'PRESIGNED'
if apex not in keys_info:
logger.warning('Failed to find %s in target_files; Ignored', apex)
continue
keys_info[apex] = (key, keys_info[apex][1]) keys_info[apex] = (key, keys_info[apex][1])
# Apply the key remapping to container keys. # Apply the key remapping to container keys.