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

Merge "target_files: copy to PRODUCT-SERVICES instead"

Browse Source 
am: 567df6214f

Change-Id: I95bf48eba07daa2b0f6d5b84c45de9b22f7aac0b
This commit is contained in:
Yifan Hong
2018-08-02 15:31:56 -07:00
committed by android-build-merger
parent 0e0794f4e4 567df6214f
commit 635887d5ac
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/Makefile
View File

@@ -3003,7 +3003,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 INSTALLED_SYSTEMOTHERIMAGE_TARGET ifdef INSTALLED_SYSTEMOTHERIMAGE_TARGET
@# Contents of the system_other image @# Contents of the system_other image

4
tools/releasetools/add_img_to_target_files.py
View File

@@ -198,7 +198,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",
@@ -643,7 +643,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")))