Merge "releasetools: Fix an issue when using APEX container key mapping." am: 7cd870ed60

am: f9a68d8167 Change-Id: I5ca4a4fc836ee9f25c4f8bcf02275000e08d77ca
2019-03-18 14:38:59 -07:00
parent 9d883220d3 f9a68d8167
commit 0891df1563
1 changed files with 1 additions and 1 deletions
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -193,7 +193,7 @@ def GetApexKeys(keys_info, key_map):
    if apex not in keys_info:
      continue
    assert key, 'Presigned APEX container for {} is not allowed'.format(apex)
-    keys_info[apex][1] = key_map.get(key, key)
+    keys_info[apex] = (keys_info[apex][0], key_map.get(key, key))

  return keys_info