diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-03-07 23:41:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2023-03-07 23:41:43 +0000 |
| commit | 135eb025f7e65abcdd9bbf8f0d45bdcbedc53c68 (patch) | |
| tree | 5e5b2a6b6986cbefef1ed275c69813690b1c8c2f | |
| parent | e497e7dfba75826559feddc1cd172d7f06aaea05 (diff) | |
| parent | 0452128f09de2280333fc9716330145a27c84887 (diff) | |
| download | build-135eb025f7e65abcdd9bbf8f0d45bdcbedc53c68.tar.gz | |
Merge "Fix sparse image detection"
| -rw-r--r-- | tools/releasetools/common.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/releasetools/common.py b/tools/releasetools/common.py index 8d16ca0d44..78055996eb 100644 --- a/tools/releasetools/common.py +++ b/tools/releasetools/common.py @@ -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 |