productservices => product_services
Make names consistent.
Some things that does not change:
- productservicesimage target and intermediates
Test: build product services image
Bug: 111609632
Change-Id: I4c2b975e194577aad3d51b908b103880625deb5e
diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 6a97182..f7324bd 100755
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -653,11 +653,11 @@
has_product = (os.path.isdir(os.path.join(OPTIONS.input_tmp, "PRODUCT")) or
os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES",
"product.img")))
- has_productservices = (os.path.isdir(os.path.join(OPTIONS.input_tmp,
- "PRODUCTSERVICES")) or
- os.path.exists(os.path.join(OPTIONS.input_tmp,
- "IMAGES",
- "product-services.img")))
+ has_product_services = (os.path.isdir(os.path.join(OPTIONS.input_tmp,
+ "PRODUCT_SERVICES")) or
+ os.path.exists(os.path.join(OPTIONS.input_tmp,
+ "IMAGES",
+ "product-services.img")))
has_system_other = os.path.isdir(os.path.join(OPTIONS.input_tmp,
"SYSTEM_OTHER"))
@@ -734,7 +734,7 @@
banner("product")
partitions['product'] = AddProduct(output_zip)
- if has_productservices:
+ if has_product_services:
banner("product-services")
partitions['product-services'] = AddProductServices(output_zip)