Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 68883e07 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

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

parents 6518cbda 87021065

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3215,7 +3215,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

core/envsetup.mk

+1 −1
Original line number Diff line number Diff line
@@ -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)

###########################################

tools/releasetools/add_img_to_target_files.py

+2 −2
Original line number Diff line number Diff line
@@ -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")))