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

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

Browse Source 
Test: builds
This reverts commit 87021065b9.

Reason for revert: reland CL

Change-Id: Ic88c2bd612ad7a19d88686b2907c812bd586ee35
Merged-In: Ic88c2bd612ad7a19d88686b2907c812bd586ee35
This commit is contained in:
Yifan Hong
2018-08-17 21:01:25 +00:00
parent a566dce20b
commit 35be6ca8f2
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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