Merge "Fix sparse image detection" am: 135eb025f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2467460 Change-Id: I829f295b9a112bbaaf64c146f63bcb6beab16793 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -2121,9 +2121,7 @@ def GetUserImage(which, tmpdir, input_zip,
|
||||
if info_dict is None:
|
||||
info_dict = LoadInfoDict(input_zip)
|
||||
|
||||
is_sparse = info_dict.get("extfs_sparse_flag")
|
||||
if info_dict.get(which + "_disable_sparse"):
|
||||
is_sparse = False
|
||||
is_sparse = IsSparseImage(os.path.join(tmpdir, "IMAGES", which + ".img"))
|
||||
|
||||
# When target uses 'BOARD_EXT4_SHARE_DUP_BLOCKS := true', images may contain
|
||||
# shared blocks (i.e. some blocks will show up in multiple files' block
|
||||
|
Reference in New Issue
Block a user