diff options
| author | Jaegeuk Kim <jaegeuk@google.com> | 2020-12-10 00:58:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-10 00:58:46 +0000 |
| commit | 863a120b5111f2ca1931e0df6f1549690bd4b2fa (patch) | |
| tree | 0c4eb9a6cdbdadc5b73d326bd1e33c61b7fb336a | |
| parent | e44fd5916c2f67c00b1222b1d01840a3a3019710 (diff) | |
| parent | 74e57f64822f2a49b406ee66999effb72b4fde6b (diff) | |
| download | build-temp_rvc_qpr_merge.tar.gz | |
Merge "Enable system partition compression" am: 74e57f6482temp_rvc_qpr_merge
Original change: https://android-review.googlesource.com/c/platform/build/+/1520098
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I7b50510b61129704f71ab4d9c474d74f4739aef0
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rwxr-xr-x | tools/releasetools/build_image.py | 13 |
2 files changed, 14 insertions, 1 deletions
diff --git a/core/Makefile b/core/Makefile index 685c77a5c2..e6bc69d10b 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1400,6 +1400,8 @@ $(if $(filter $(2),system),\ $(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)" >> $(1)) $(if $(INTERNAL_SYSTEM_OTHER_PARTITION_SIZE),$(hide) echo "system_other_size=$(INTERNAL_SYSTEM_OTHER_PARTITION_SIZE)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE)" >> $(1)) + $(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_COMPRESS),$(hide) echo "system_fs_compress=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_COMPRESS)" >> $(1)) + $(if $(BOARD_SYSTEMIMAGE_F2FS_SLOAD_COMPRESS_FLAGS),$(hide) echo "system_f2fs_sldc_flags=$(BOARD_SYSTEMIMAGE_F2FS_SLOAD_COMPRESS_FLAGS)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT),$(hide) echo "system_extfs_inode_count=$(BOARD_SYSTEMIMAGE_EXTFS_INODE_COUNT)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_EXTFS_RSV_PCT),$(hide) echo "system_extfs_rsv_pct=$(BOARD_SYSTEMIMAGE_EXTFS_RSV_PCT)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_JOURNAL_SIZE),$(hide) echo "system_journal_size=$(BOARD_SYSTEMIMAGE_JOURNAL_SIZE)" >> $(1)) diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index fbed77d553..820c128a4e 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -350,8 +350,17 @@ def BuildImageMkfs(in_dir, prop_dict, out_file, target_out, fs_config): build_command.append("--prjquota") if (needs_casefold): build_command.append("--casefold") - if (needs_compress): + if (needs_compress or prop_dict.get("system_fs_compress") == "true"): build_command.append("--compression") + if (prop_dict.get("system_fs_compress") == "true"): + build_command.append("--sldc") + if (prop_dict.get("system_f2fs_sldc_flags") == None): + build_command.append(str(0)) + else: + sldc_flags_str = prop_dict.get("system_f2fs_sldc_flags") + sldc_flags = sldc_flags_str.split() + build_command.append(str(len(sldc_flags))) + build_command.extend(sldc_flags) else: raise BuildImageError( "Error: unknown filesystem type: {}".format(fs_type)) @@ -555,6 +564,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): "extfs_sparse_flag", "erofs_sparse_flag", "squashfs_sparse_flag", + "system_fs_compress", + "system_f2fs_sldc_flags", "f2fs_sparse_flag", "skip_fsck", "ext_mkuserimg", |