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

s/product-services/product_services/g

Browse Source 
Attempting to reduce the number of different spellings we have for
"product services" partition in the codebase.

Bug: 112431447
Test: m
Change-Id: I6debd3f5f5abc4bd1e22f2ef11c5fe131915976c
Merged-In: I6debd3f5f5abc4bd1e22f2ef11c5fe131915976c
This commit is contained in:
Dario Freni
2018-08-17 00:56:14 +01:00
committed by Yifan Hong
parent 35be6ca8f2
commit 924af7d4dd
9 changed files with 59 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tools/releasetools/build_image.py
View File

@@ -909,7 +909,7 @@ def ImagePropFromGlobalDict(glob_dict, mount_point):
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":
elif mount_point == "product_services":
copy_prop("avb_product_services_hashtree_enable", "avb_hashtree_enable")
copy_prop("avb_product_services_add_hashtree_footer_args",
"avb_add_hashtree_footer_args")
@@ -1000,7 +1000,7 @@ def GlobalDictFromImageProp(image_prop, mount_point):
copy_prop(size_property, "odm_size")
elif mount_point == "product":
copy_prop(size_property, "product_size")
elif mount_point == "product-services":
elif mount_point == "product_services":
copy_prop(size_property, "product_services_size")
return d
@@ -1045,8 +1045,8 @@ def main(argv):
mount_point = "oem"
elif image_filename == "product.img":
mount_point = "product"
elif image_filename == "product-services.img":
mount_point = "product-services"
elif image_filename == "product_services.img":
mount_point = "product_services"
else:
print("error: unknown image file name ", image_filename, file=sys.stderr)
sys.exit(1)