commit b4e4adc195861971166f993eb7323bff5af722db
author Tianjie Xu <xunchang@google.com> Fri Aug 12 18:13:06 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 12 18:13:06 2016 +0000
tree c262cf2c3353a7064fcc58cc471f09af0de5d198
parent 94219ae942d3ab4e81a6950a164d4bc9df2c1a09
parent 4f4fb6ce45abde611ec487d8fcdeb6db0514054d

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

Change-Id: If8dd9a34ad92a8d951332376273735573ea8a4c6

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