Merge "releasetools: Ignore nonexistent APEX overrides."

2019-07-12 14:42:37 +00:00 · 2019-07-12 14:42:37 +00:00 · d077c5b88e
parent 3f7c416650 3422309d6d
commit d077c5b88e
1 changed files with 3 additions and 0 deletions
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@ -188,6 +188,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.