diff options
| author | Tao Bao <tbao@google.com> | 2019-07-11 11:52:52 -0700 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-12 04:09:38 +0000 |
| commit | 61dbb09a869788d563a6e2dfb467decabe383e9b (patch) | |
| tree | 40be15de1afe8230337f70e4ed9a7b9c3c5d93f8 | |
| parent | b959e7cf944122441f87e5cb0ef52c132f41021c (diff) | |
| download | build-61dbb09a869788d563a6e2dfb467decabe383e9b.tar.gz | |
releasetools: Ignore nonexistent APEX overrides.
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
(cherry picked from commit b369c7226a00ef15c9f61ef84865eb5c0c02e028)
| -rwxr-xr-x | tools/releasetools/sign_target_files_apks.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py index c698b1cbee..e8c4163e95 100755 --- a/tools/releasetools/sign_target_files_apks.py +++ b/tools/releasetools/sign_target_files_apks.py @@ -185,6 +185,9 @@ def GetApexKeys(keys_info, key_map): for apex, key in OPTIONS.extra_apex_payload_keys.items(): if not key: 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]) # Apply the key remapping to container keys. |