summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Tianjie Xu <xunchang@google.com> 2016-08-12 18:01:55 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2016-08-12 18:01:56 +0000
commit7b11cacbbabfa7a47d78d82d0aac24b94af1f81c (patch)
tree72724fc10a0de518526ef1aed5f1f1ea1cab9e7d
parent0d86fc57cd8cee7707604715dad589d6f3d01aeb (diff)
parent4f09900e676f7343643ada3797c3597f9c363015 (diff)
Merge "Replace META/care_map.txt when signing target files"
-rwxr-xr-xtools/releasetools/sign_target_files_apks.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/releasetools/sign_target_files_apks.py b/tools/releasetools/sign_target_files_apks.py
index 14ee963ead..0f20f826af 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -279,6 +279,10 @@ def ProcessTargetFiles(input_tf_zip, output_tf_zip, misc_info,
info.filename == "BOOT/cmdline"):
pass
+ # Skip the care_map as we will regenerate the system/vendor images.
+ elif (info.filename == "META/care_map.txt"):
+ pass
+
# Copy BOOT/, RECOVERY/, META/, ROOT/ to rebuild recovery patch. This case
# must come AFTER other matching rules.
elif (info.filename.startswith("BOOT/") or