tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
This reverts commit 77c778c040.

Reason for revert: git-master break on 4960355

Change-Id: I2fd272c63ef496067f12852bcf98ffc1194c54bf
This commit is contained in:
Shawn Yang 2018-08-17 19:02:08 +00:00
parent 77c778c040
commit 87021065b9
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/Makefile
View file

@ -3214,7 +3214,7 @@ endif
ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE ifdef BOARD_PRODUCT_SERVICESIMAGE_FILE_SYSTEM_TYPE
@# Contents of the product-services image @# Contents of the product-services image
$(hide) $(call package_files-copy-root, \ $(hide) $(call package_files-copy-root, \
$(TARGET_OUT_PRODUCT_SERVICES),$(zip_root)/PRODUCT_SERVICES) $(TARGET_OUT_PRODUCT_SERVICES),$(zip_root)/PRODUCT-SERVICES)
endif endif
ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE ifdef BOARD_ODMIMAGE_FILE_SYSTEM_TYPE
@# Contents of the odm image @# Contents of the odm image

2
core/envsetup.mk
View file

@ -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 # A device can set up TARGET_COPY_OUT_PRODUCT_SERVICES to "product-services" in its
# BoardConfig.mk. # BoardConfig.mk.
# We'll substitute with the real value after loading 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) TARGET_COPY_OUT_PRODUCT_SERVICES := $(_product_services_path_placeholder)
########################################### ###########################################

4
tools/releasetools/add_img_to_target_files.py
View file

@ -200,7 +200,7 @@ def AddProduct(output_zip):
def AddProductServices(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.""" store it in output_zip."""
img = OutputFile(output_zip, OPTIONS.input_tmp, "IMAGES", 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", os.path.exists(os.path.join(OPTIONS.input_tmp, "IMAGES",
"product.img"))) "product.img")))
has_product_services = (os.path.isdir(os.path.join(OPTIONS.input_tmp, 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, os.path.exists(os.path.join(OPTIONS.input_tmp,
"IMAGES", "IMAGES",
"product-services.img"))) "product-services.img")))