releasetools: Fix the bug when generating care_map.txt.

Commit f1a13180db 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
This commit is contained in:
Tao Bao
2017-02-05 12:47:17 -08:00
parent 1604b38040
commit 82bdf6c1d7

View File

@@ -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"