commit 955629b4aa650fbdc681346d1f07906fabfb3226
author Tianjie Xu <xunchang@google.com> Wed Mar 01 11:48:25 2017 -0800
committer Tianjie Xu <xunchang@google.com> Thu Mar 02 11:07:12 2017 -0800
tree de4ebb8b4ffc4f21573bc42b83c8c834679ec90e
parent aea79fa207e020ec54b0cb274b91a771fc65d39b

Do not read the block device when generating the care map

This remove the fstab dependency when building the OTA package for
marlin/sailfish.

Bug: 35811655
Test: OTA package builds successfully for sailfish.
Change-Id: If223d11dddca396c47262042c576f9e7d0cb5b33
(cherry picked from commit 7d051adc3be56594ee755bf4ed06b6597fd62268)

tools/releasetools/add_img_to_target_files.py

diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 28fd474..9403a77 100755
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -77,11 +77,10 @@
   """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"