p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge changes Ia8fb5696,Id5ae6645 am: 6b38c9bb4c 

am: d1eda9937a

Change-Id: Iecc5f662736791d824cb9aa45ef4719d7eb6d9d6
This commit is contained in:
Mark Salyzyn 2018-10-29 16:50:02 -07:00 committed by android-build-merger
parent 54cbd82865 d1eda9937a
commit 408186174e
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/releasetools/build_image.py
View File

@ -297,7 +297,7 @@ def BuildImage(in_dir, prop_dict, out_file, target_out=None):
logger.info(
"Not worth reducing image %d <= %d.", free_size, reserved_size)
else:
size -= free_size
size -= free_size + (free_size // 59)
size += reserved_size
if block_size <= 4096:
size = common.RoundUpTo4K(size)
@ -573,6 +573,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
if not copy_prop("system_journal_size", "journal_size"):
d["journal_size"] = "0"
copy_prop("system_verity_block_device", "verity_block_device")
copy_prop("ext4_share_dup_blocks", "ext4_share_dup_blocks")
copy_prop("system_squashfs_compressor", "squashfs_compressor")
copy_prop("system_squashfs_compressor_opt", "squashfs_compressor_opt")
copy_prop("system_squashfs_block_size", "squashfs_block_size")
@ -623,6 +624,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
if not copy_prop("product_journal_size", "journal_size"):
d["journal_size"] = "0"
copy_prop("product_verity_block_device", "verity_block_device")
copy_prop("ext4_share_dup_blocks", "ext4_share_dup_blocks")
copy_prop("product_squashfs_compressor", "squashfs_compressor")
copy_prop("product_squashfs_compressor_opt", "squashfs_compressor_opt")
copy_prop("product_squashfs_block_size", "squashfs_block_size")
@ -643,6 +645,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
if not copy_prop("product_services_journal_size", "journal_size"):
d["journal_size"] = "0"
copy_prop("product_services_verity_block_device", "verity_block_device")
copy_prop("ext4_share_dup_blocks", "ext4_share_dup_blocks")
copy_prop("product_services_squashfs_compressor", "squashfs_compressor")
copy_prop("product_services_squashfs_compressor_opt",
"squashfs_compressor_opt")
@ -665,6 +668,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
if not copy_prop("odm_journal_size", "journal_size"):
d["journal_size"] = "0"
copy_prop("odm_verity_block_device", "verity_block_device")
copy_prop("ext4_share_dup_blocks", "ext4_share_dup_blocks")
copy_prop("odm_squashfs_compressor", "squashfs_compressor")
copy_prop("odm_squashfs_compressor_opt", "squashfs_compressor_opt")
copy_prop("odm_squashfs_block_size", "squashfs_block_size")
@ -680,6 +684,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
if not copy_prop("oem_journal_size", "journal_size"):
d["journal_size"] = "0"
copy_prop("oem_extfs_inode_count", "extfs_inode_count")
copy_prop("ext4_share_dup_blocks", "ext4_share_dup_blocks")
if not copy_prop("oem_extfs_rsv_pct", "extfs_rsv_pct"):
d["extfs_rsv_pct"] = "0"
d["partition_name"] = mount_point