StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dario Freni
2018-08-17 00:43:02 +00:00
committed by Gerrit Code Review
parent fb5314a2a9 77c778c040
commit 28156406b4
3 changed files with 4 additions and 4 deletions
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
@# 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

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
# 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)
###########################################

4
tools/releasetools/add_img_to_target_files.py
View File

@@ -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")))