StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix sparse image detection" am: 135eb025f7

Browse Source 
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:
Treehugger Robot
2023-03-07 23:53:09 +00:00
committed by Automerger Merge Worker
parent fd3a7181df 135eb025f7
commit 5a776518a1
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tools/releasetools/common.py
View File

@@ -2121,9 +2121,7 @@ def GetUserImage(which, tmpdir, input_zip,
if info_dict is None: if info_dict is None:
info_dict = LoadInfoDict(input_zip) info_dict = LoadInfoDict(input_zip)
is_sparse = info_dict.get("extfs_sparse_flag") is_sparse = IsSparseImage(os.path.join(tmpdir, "IMAGES", which + ".img"))
if info_dict.get(which + "_disable_sparse"):
is_sparse = False
# When target uses 'BOARD_EXT4_SHARE_DUP_BLOCKS := true', images may contain # 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 # shared blocks (i.e. some blocks will show up in multiple files' block