Merge "Fix sparse image detection" am: 135eb025f7 am: 5a776518a1

Original change: https://android-review.googlesource.com/c/platform/build/+/2467460

Change-Id: I81a39cdba26ff44df1330fd7593a9f85a739620e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot 2023-03-08 00:09:29 +00:00 committed by Automerger Merge Worker
commit 679fe3fc75

View file

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