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

Commit 567df621 authored by Yifan Hong's avatar Yifan Hong Committed by Gerrit Code Review
Browse files

Merge "target_files: copy to PRODUCT-SERVICES instead"

parents e9bee376 4d6b38c4

core/Makefile

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

	@# Contents of the system_other image

tools/releasetools/add_img_to_target_files.py

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