Merge "target_files: copy to PRODUCT-SERVICES instead"

This commit is contained in:
Yifan Hong
2018-08-02 21:53:57 +00:00
committed by Gerrit Code Review
2 changed files with 3 additions and 3 deletions

View File

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