commit 35be6ca8f26122109ea979826d4eae96901e7c6a
author Yifan Hong <elsk@google.com> Fri Aug 17 21:01:25 2018 +0000
committer Yifan Hong <elsk@google.com> Mon Aug 20 10:44:59 2018 -0700
tree 57a6b3adae011ef1d93be15971bb7ca116593323
parent a566dce20b36942cc5143a12eaefe0aebaa274a0

Reland "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g"

Test: builds
This reverts commit 87021065b93c65dcf5616c9d31bcea5e1c6225e8.

Reason for revert: reland CL

Change-Id: Ic88c2bd612ad7a19d88686b2907c812bd586ee35
Merged-In: Ic88c2bd612ad7a19d88686b2907c812bd586ee35

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index b88edb7..1bd5127 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