commit 4e16ac5b666b61b754d0a9f165c6c61008cc9e52
author Tianjie Xu <xunchang@google.com> Fri Aug 12 18:20:13 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 12 18:20:13 2016 +0000
tree 6273fca841ecd0d874d2789fd01ded0a3b0bde10
parent a5005ea85a694da3223b1db9517894391217bb65
parent b4e4adc195861971166f993eb7323bff5af722db

Merge "Replace META/care_map.txt when signing target files" am: 7b11cacbba am: bf5e3d168d am: 4f4fb6ce45
am: b4e4adc195

Change-Id: If37d29f7e5447651b384b98863425315ed9f3262

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 14ee963..0f20f82 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -279,6 +279,10 @@
           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