commit 924af7d4dd52c88b2b051a8e1ba1f1da0f200cf9
author Dario Freni <dariofreni@google.com> Fri Aug 17 00:56:14 2018 +0100
committer Yifan Hong <elsk@google.com> Mon Aug 20 10:44:59 2018 -0700
tree c37ba245a385e1669b590e65a26dbb4d7243f4a0
parent 35be6ca8f26122109ea979826d4eae96901e7c6a

s/product-services/product_services/g

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

tools/releasetools/build_image.py

diff --git a/tools/releasetools/build_image.py b/tools/releasetools/build_image.py
index 86ba1a6..af64955 100755
--- a/tools/releasetools/build_image.py
+++ b/tools/releasetools/build_image.py
@@ -909,7 +909,7 @@
     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 @@
     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 @@
       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)