Merge "Do not read the block device when generating the care map"

am: d9880a0246 Change-Id: I466278a0f2a0158a4a5180be0b99d69e46585be9
2017-03-02 21:41:14 +00:00 · 2017-03-02 21:41:14 +00:00 · 4ef67cee73
parent 39809e3800 d9880a0246
commit 4ef67cee73
1 changed files with 1 additions and 2 deletions
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@ -77,11 +77,10 @@ def GetCareMap(which, imgname):
  """Generate care_map of system (or vendor) partition"""

  assert which in ("system", "vendor")
-  _, blk_device = common.GetTypeAndDevice("/" + which, OPTIONS.info_dict)

  simg = sparse_img.SparseImage(imgname)
  care_map_list = []
-  care_map_list.append(blk_device)
+  care_map_list.append(which)

  care_map_ranges = simg.care_map
  key = which + "_adjusted_partition_size"