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

tools/releasetools/add_img_to_target_files.py

diff --git a/tools/releasetools/add_img_to_target_files.py b/tools/releasetools/add_img_to_target_files.py
index 6d2c499..22e7f4b 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")))