From 82bdf6c1d7ed5ed2967e0670c1d0a446d6464f91 Mon Sep 17 00:00:00 2001 From: Tao Bao Date: Sun, 5 Feb 2017 12:47:17 -0800 Subject: [PATCH] releasetools: Fix the bug when generating care_map.txt. Commit f1a13180dba9c0145ac7bec8371340ae303c81c1 intended to remove the verity blocks from care_map.txt, but it added new code without removing the old one. This leads to a malformed care_map.txt and causes update_verifier failure. Bug: 34391662 Test: 'm -j dist' gives a TF.zip with 4-line META/care_map.txt (as opposed to a 6-line file). Change-Id: I7ff1aa525795c4b049af54c1755b0f0ea84f7e0e --- tools/releasetools/add_img_to_target_files.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py index b9aef7c18..28fd474c9 100755 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -82,7 +82,6 @@ def GetCareMap(which, imgname): simg = sparse_img.SparseImage(imgname) care_map_list = [] care_map_list.append(blk_device) - care_map_list.append(simg.care_map.to_string_raw()) care_map_ranges = simg.care_map key = which + "_adjusted_partition_size"