commit 4c05f4a41e2169fa7eef1c5749953aa4ea9f98c1
author Tianjie Xu <xunchang@google.com> Fri Sep 14 16:24:41 2018 -0700
committer Tianjie Xu <xunchang@google.com> Tue Sep 18 15:42:40 2018 -0700
tree 3cd84683954a040e67f78c87190b3adaee77d748
parent 15f4979639c4a2c7a9f4d180801f58a4792b2e94

Rename care map in pb format to care_map.pb

The new suffix distinguishes the new care_map from the ones in plain
text format; and thus the old update_verifier won't report an error
upon parsing failures.

Bug: 115740187
Test: Generate OTA files for Pixels
Change-Id: Ia782afd8cbb0f4bb8c363edaa00e92ab302d5d1b

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 cb0c268..db006d1 100755
--- a/tools/releasetools/sign_target_files_apks.py
+++ b/tools/releasetools/sign_target_files_apks.py
@@ -395,7 +395,7 @@
       pass
 
     # Skip the care_map as we will regenerate the system/vendor images.
-    elif filename == "META/care_map.txt":
+    elif filename == "META/care_map.pb" or filename == "META/care_map.txt":
       pass
 
     # A non-APK file; copy it verbatim.