Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 679fe3fc authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix sparse image detection" am: 135eb025 am: 5a776518 

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



Change-Id: I81a39cdba26ff44df1330fd7593a9f85a739620e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cc0527f1 5a776518

tools/releasetools/common.py

+1 −3
Original line number Diff line number Diff line
@@ -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