Merge "Revert "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g""
diff --git a/core/Makefile b/core/Makefile
index 1bd5127..b88edb7 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -3215,7 +3215,7 @@
ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE
@# Contents of the product-services image
$(hide) $(call package_files-copy-root, \
- $(TARGET_OUT_PRODUCT_SERVICES),$(zip_root)/PRODUCT_SERVICES)
+ $(TARGET_OUT_PRODUCT_SERVICES),$(zip_root)/PRODUCT-SERVICES)
endif
ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE
@# Contents of the odm image
diff --git a/core/envsetup.mk b/core/envsetup.mk
index 8750203..125dadf 100644
--- a/core/envsetup.mk
+++ b/core/envsetup.mk
@@ -218,7 +218,7 @@
# A device can set up TARGET_COPY_OUT_PRODUCT_SERVICES to "product-services" in its
# BoardConfig.mk.
# We'll substitute with the real value after loading BoardConfig.mk.
-_product_services_path_placeholder := ||PRODUCT_SERVICES-PATH-PH||
+_product_services_path_placeholder := ||PRODUCT-SERVICES-PATH-PH||
TARGET_COPY_OUT_PRODUCT_SERVICES := $(_product_services_path_placeholder)
###########################################
diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 22e7f4b..6d2c499 100755
--- a/tools/releasetools/add_img_to_target_files.py
+++ b/tools/releasetools/add_img_to_target_files.py
@@ -200,7 +200,7 @@
def AddProductServices(output_zip):
- """Turn the contents of PRODUCT_SERVICES into a product-services image and
+ """Turn the contents of PRODUCT-SERVICES into a product-services image and
store it in output_zip."""
img = OutputFile(output_zip, OPTIONS.input_tmp, "IMAGES",
@@ -681,7 +681,7 @@
os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES",
"product.img")))
has_product_services = (os.path.isdir(os.path.join(OPTIONS.input_tmp,
- "PRODUCT_SERVICES")) or
+ "PRODUCT-SERVICES")) or
os.path.exists(os.path.join(OPTIONS.input_tmp,
"IMAGES",
"product-services.img")))