diff options
| author | Simon Wilson <simonwilson@google.com> | 2015-06-24 23:13:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-24 23:14:07 +0000 |
| commit | b7b7aedeb3c960890e3842ec8e729dbd10077ae4 (patch) | |
| tree | f3b4ce7ecca8127dc715f3c3220fb138ca0d0ec9 | |
| parent | 914811a9f283ed3d8aa826abddf8c11f6167dc14 (diff) | |
| parent | 6d5ddc32abcea651afdfdd4c2f6435506007aede (diff) | |
| download | build-b7b7aedeb3c960890e3842ec8e729dbd10077ae4.zip build-b7b7aedeb3c960890e3842ec8e729dbd10077ae4.tar.gz build-b7b7aedeb3c960890e3842ec8e729dbd10077ae4.tar.bz2 | |
Merge "resolved conflicts for merge of ecfc97f7 to mnc-dev" into mnc-dev
| -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 64d497b..90eb978 100644 --- a/core/Makefile +++ b/core/Makefile @@ -735,6 +735,8 @@ $(if $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),$(hide) echo "system_fs_type=$(BOARD_ $(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_FLASH_BLOCK_SIZE),$(hide) echo "blocksize=$(BOARD_FLASH_BLOCK_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 5ea18a3..9283e2c 100755 --- a/tools/releasetools/build_image.py +++ b/tools/releasetools/build_image.py @@ -296,6 +296,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"]]) @@ -404,6 +408,8 @@ def ImagePropFromGlobalDict(glob_dict, mount_point): copy_prop("ramdisk_dir", "ramdisk_dir") copy_prop("has_ext4_reserved_blocks", "has_ext4_reserved_blocks") copy_prop("blocksize", "blocksize") + 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") |