From 87021065b93c65dcf5616c9d31bcea5e1c6225e8 Mon Sep 17 00:00:00 2001 From: Shawn Yang Date: Fri, 17 Aug 2018 19:02:08 +0000 Subject: [PATCH] Revert "s/PRODUCT-SERVICES/PRODUCT_SERVICES/g" This reverts commit 77c778c040bf8717d6c5d4066b533b3d5ece8050. Reason for revert: git-master break on 4960355 Change-Id: I2fd272c63ef496067f12852bcf98ffc1194c54bf --- core/Makefile | 2 +- core/envsetup.mk | 2 +- tools/releasetools/add_img_to_target_files.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/Makefile b/core/Makefile index ee8303ea1b..52e93b2da1 100644 --- a/core/Makefile +++ b/core/Makefile @@ -3214,7 +3214,7 @@ endif 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 8750203223..125dadfb4c 100644 --- a/core/envsetup.mk +++ b/core/envsetup.mk @@ -218,7 +218,7 @@ TARGET_COPY_OUT_PRODUCT := $(_product_path_placeholder) # 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 66fe18b76f..932fab9fc1 100755 --- a/tools/releasetools/add_img_to_target_files.py +++ b/tools/releasetools/add_img_to_target_files.py @@ -200,7 +200,7 @@ def AddProduct(output_zip): 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", @@ -664,7 +664,7 @@ def AddImagesToTargetFiles(filename): 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")))