StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes from topic "board_partition_reserved_size"

Browse Source 
am: 2d90c246a9

Change-Id: I460ea917b47a61acb0cbb0f17a867d15f61c7d6d
This commit is contained in:
Yifan Hong
2018-07-23 11:58:52 -07:00
committed by android-build-merger
parent f87ea90d76 2d90c246a9
commit fe421ed263
4 changed files with 34 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/releasetools/build_image.py
View File

@@ -875,6 +875,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
copy_prop("product_extfs_inode_count", "extfs_inode_count")
if not copy_prop("product_extfs_rsv_pct", "extfs_rsv_pct"):
d["extfs_rsv_pct"] = "0"
copy_prop("product_reserved_size", "partition_reserved_size")
elif mount_point == "product-services":
copy_prop("avb_productservices_hashtree_enable", "avb_hashtree_enable")
copy_prop("avb_productservices_add_hashtree_footer_args",
@@ -896,6 +897,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
copy_prop("productservices_extfs_inode_count", "extfs_inode_count")
if not copy_prop("productservices_extfs_rsv_pct", "extfs_rsv_pct"):
d["extfs_rsv_pct"] = "0"
copy_prop("productservices_reserved_size", "partition_reserved_size")
elif mount_point == "oem":
copy_prop("fs_type", "fs_type")
copy_prop("oem_size", "partition_size")
@@ -935,6 +937,10 @@ def GlobalDictFromImageProp(image_prop, mount_point):
copy_prop("partition_size", "system_size")
elif mount_point == "vendor":
copy_prop("partition_size", "vendor_size")
elif mount_point == "product":
copy_prop("partition_size", "product_size")
elif mount_point == "product-services":
copy_prop("partition_size", "productservices_size")
return d