diff options
| author | Simon Wilson <simonwilson@google.com> | 2015-06-24 15:42:27 -0700 |
|---|---|---|
| committer | Simon Wilson <simonwilson@google.com> | 2015-06-24 15:42:27 -0700 |
| commit | ecfc97f772bb1ab74c107258ba548024d12a62da (patch) | |
| tree | 9aab9b8f9461ed7fc64eeed2ac4bb825aed74687 | |
| parent | 9ca7fa8993bceb97a6256b60742eeda2f699560b (diff) | |
| parent | f86e7eeabc9721034d2c4af3b2827d93c2d23f6b (diff) | |
| download | build-ecfc97f772bb1ab74c107258ba548024d12a62da.zip build-ecfc97f772bb1ab74c107258ba548024d12a62da.tar.gz build-ecfc97f772bb1ab74c107258ba548024d12a62da.tar.bz2 | |
resolved conflicts for merge of f86e7eea to lmp-mr1-ub-dev
Change-Id: I746021aa57edd5f6fae6e57cec0908951a659664
| -rw-r--r-- | core/Makefile | 2 | ||||
| -rwxr-xr-x | tools/releasetools/build_image.py | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/core/Makefile b/core/Makefile index 8ff1111..945e6c1 100644 --- a/core/Makefile +++ b/core/Makefile @@ -705,6 +705,8 @@ $(if $(INTERNAL_USERIMAGES_EXT_VARIANT),$(hide) echo "fs_type=$(INTERNAL_USERIMA $(if $(BOARD_SYSTEMIMAGE_PARTITION_SIZE),$(hide) echo "system_size=$(BOARD_SYSTEMIMAGE_PARTITION_SIZE)" >> $(1)) $(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_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 04ced09..ef2c2d6 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -271,6 +271,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"]]) @@ -377,6 +381,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): copy_prop("system_verity_block_device", "verity_block_device") copy_prop("system_root_image","system_root_image") copy_prop("ramdisk_dir","ramdisk_dir") + 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") |