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

Commit d44df7d9 authored by Justin Yun's avatar Justin Yun Committed by android-build-merger
Browse files

Revert "Do not allow building product_services image" 

am: dbc22f4f

Change-Id: Ie9bc9787357159835587c826d460dd2eda80160d
parents 2a29422f dbc22f4f

core/board_config.mk

+4 −4
Original line number Diff line number Diff line
@@ -420,9 +420,9 @@ ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),$(_product_services_path_placeholder)) 
  MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true

else ifeq ($(TARGET_COPY_OUT_PRODUCT),$(TARGET_COPY_OUT_PRODUCT_SERVICES))

  MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true

else ifeq ($(filter system/product_services,$(TARGET_COPY_OUT_PRODUCT_SERVICES)),)

  $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be either '$(TARGET_COPY_OUT_PRODUCT)'\

    or 'system/product_services', seeing '$(TARGET_COPY_OUT_PRODUCT_SERVICES)'.)

else ifeq ($(filter product_services system/product_services,$(TARGET_COPY_OUT_PRODUCT_SERVICES)),)

  $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be either 'product_services',\

    '$(TARGET_COPY_OUT_PRODUCT)' or 'system/product_services', seeing '$(TARGET_COPY_OUT_PRODUCT_SERVICES)'.)

endif

.KATI_READONLY := MERGE_PRODUCT_SERVICES_INTO_PRODUCT

PRODUCT_COPY_FILES := $(subst $(_product_services_path_placeholder),$(TARGET_COPY_OUT_PRODUCT_SERVICES),$(PRODUCT_COPY_FILES))
@@ -437,7 +437,7 @@ endif 
ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),product_services)

  BOARD_USES_PRODUCT_SERVICESIMAGE := true

else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE

  $(error A 'product_services' partition should not be used. Use 'system/product_services' instead.)

  $(error TARGET_COPY_OUT_PRODUCT_SERVICES must be set to 'product_services' to use a product_services image)

endif



BUILDING_PRODUCT_SERVICES_IMAGE :=