commit 154a6a624d7302a72ac60ff9ba50d8e1a763a3a5
author Tao Bao <tbao@google.com> Thu Jul 11 16:30:37 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu Jul 11 16:30:37 2019 -0700
tree 95e01f5286bea4003032fd5e27aef2c461f6d662
parent 6e1f7a08931040df7b05ad9f759d1c3fea8750b6
parent a6935cc16af2a95f54aca702b0a9e4b76df5665b

Merge "releasetools: Ignore nonexistent APEX overrides." into qt-dev
am: a6935cc16a

Change-Id: If138057ea1ebd966a1a83baa8366ee1d0edcb9ed

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 ae77b46..1b3d6f1 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -185,6 +185,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.