AI 146194: am: CL 146193 Fix signing script so keys specified in -e options get passed
through the key map. Clarify the help for the -e option to
make clear this should happen.
(This change doesn't affect device code.)
Original author: dougz
Merged from: //branches/cupcake/...
Automated import of CL 146194
diff --git a/tools/releasetools/sign_target_files_apks b/tools/releasetools/sign_target_files_apks
index a87d198..b632924 100755
--- a/tools/releasetools/sign_target_files_apks
+++ b/tools/releasetools/sign_target_files_apks
@@ -26,8 +26,10 @@
-e (--extra_apks) <name,name,...=key>
Add extra APK name/key pairs as though they appeared in
- apkcerts.zip. Option may be repeated to give multiple extra
- packages.
+ apkcerts.txt (so mappings specified by -k and -d are applied).
+ Keys specified in -e override any value for that app contained
+ in the apkcerts.txt file. Option may be repeated to give
+ multiple extra packages.
-k (--key_mapping) <src_key=dest_key>
Add a mapping from the key name as specified in apkcerts.txt (the
@@ -68,7 +70,7 @@
def GetApkCerts(tf_zip):
- certmap = OPTIONS.extra_apks.copy()
+ certmap = {}
for line in tf_zip.read("META/apkcerts.txt").split("\n"):
line = line.strip()
if not line: continue
@@ -77,6 +79,8 @@
if not m:
raise SigningError("failed to parse line from apkcerts.txt:\n" + line)
certmap[m.group(1)] = OPTIONS.key_map.get(m.group(2), m.group(2))
+ for apk, cert in OPTIONS.extra_apks.iteritems():
+ certmap[apk] = OPTIONS.key_map.get(cert, cert)
return certmap