From 011ea06db724ac89a8f3daddddb1b67174ff8afb Mon Sep 17 00:00:00 2001 From: Simon Wilson Date: Wed, 17 Jun 2015 12:35:15 -0700 Subject: [PATCH] Add compressor options for squashfs system images Change-Id: I2a75f8754273f6e00b96ba6aca6741c4388f5da8 (cherry picked from commit f86e7eeabc9721034d2c4af3b2827d93c2d23f6b) --- core/Makefile | 2 ++ tools/releasetools/build_image.py | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/core/Makefile b/core/Makefile index e17c4ed606..255a6fba47 100644 --- a/core/Makefile +++ b/core/Makefile @@ -702,6 +702,8 @@ $(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTE $(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE)" >> $(1)) $(if $(BOARD_SYSTEMIMAGE_JOURNAL_SIZE),$(hide) echo "system_journal_size=$(BOARD_SYSTEMIMAGE_JOURNAL_SIZE)" >> $(1)) $(if $(BOARD_HAS_EXT4_RESERVED_BLOCKS),$(hide) echo "has_ext4_reserved_blocks=$(BOARD_HAS_EXT4_RESERVED_BLOCKS)" >> $(1)) +$(if $(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR),$(hide) echo "system_squashfs_compressor=$(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR)" >> $(1)) +$(if $(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR_OPT),$(hide) echo "system_squashfs_compressor_opt=$(BOARD_SYSTEMIMAGE_SQUASHFS_COMPRESSOR_OPT)" >> $(1)) $(if $(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "userdata_fs_type=$(BOARD_USERDATAIMAGE_FILE_SYSTEM_TYPE)" >> $(1)) $(if $(BOARD_USERDATAIMAGE_PARTITION_SIZE),$(hide) echo "userdata_size=$(BOARD_USERDATAIMAGE_PARTITION_SIZE)" >> $(1)) $(if $(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "cache_fs_type=$(BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE)" >> $(1)) diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py index 8934c77ae2..32c0ee4efe 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -275,6 +275,10 @@ def BuildImage(in_dir, prop_dict, out_file): build_command.extend(["-m", prop_dict["mount_point"]]) if "selinux_fc" in prop_dict: build_command.extend(["-c", prop_dict["selinux_fc"]]) + if "squashfs_compressor" in prop_dict: + build_command.extend(["-z", prop_dict["squashfs_compressor"]]) + if "squashfs_compressor_opt" in prop_dict: + build_command.extend(["-zo", prop_dict["squashfs_compressor_opt"]]) elif fs_type.startswith("f2fs"): build_command = ["mkf2fsuserimg.sh"] build_command.extend([out_file, prop_dict["partition_size"]]) @@ -414,6 +418,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): copy_prop("system_root_image", "system_root_image") copy_prop("ramdisk_dir", "ramdisk_dir") copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks") + copy_prop("system_squashfs_compressor", "squashfs_compressor") + copy_prop("system_squashfs_compressor_opt", "squashfs_compressor_opt") elif mount_point == "data": # Copy the generic fs type first, override with specific one if available. copy_prop("fs_type", "fs_type")