commit 0f6c1d2b47e13203f19b7eeef8fb072da98a38c8
author Tao Bao <tbao@google.com> Fri Jul 12 08:00:29 2019 -0700
committer android-build-merger <android-build-merger@google.com> Fri Jul 12 08:00:29 2019 -0700
tree d8da3ff56efe2beba68c83245407f47c82af965c
parent 155c1cef48ef37c965ae2960978e57f1ad9b48df
parent d077c5b88ec99d220b0fde7b6db94137c710822b

Merge "releasetools: Ignore nonexistent APEX overrides."
am: d077c5b88e

Change-Id: Idc8e680e3140599f81c5f9cdc33e2a647a95a300

tools/releasetools/sign_target_files_apks.py

diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 04b627b..4cb3a37 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -188,6 +188,9 @@
   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.