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

Commit 25065c44 authored by Justin Yun's avatar Justin Yun
Browse files

Do not allow building product_services image 

product_services partition is designed for the test purpose only. It
must not be included in the target devices.

Bug: 134359158
Test: Build configuration for product_services partition must return
      error message.

Change-Id: I6f8cdf73d18ad3174c7b31edb5d5ee10df75a776
parent 9547929a

core/board_config.mk

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

  MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true

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

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

  MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true

  MERGE_PRODUCT_SERVICES_INTO_PRODUCT := true

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

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

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

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

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

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

endif

endif

.KATI_READONLY := MERGE_PRODUCT_SERVICES_INTO_PRODUCT

.KATI_READONLY := MERGE_PRODUCT_SERVICES_INTO_PRODUCT

PRODUCT_COPY_FILES := $(subst $(_product_services_path_placeholder),$(TARGET_COPY_OUT_PRODUCT_SERVICES),$(PRODUCT_COPY_FILES))

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

ifeq ($(TARGET_COPY_OUT_PRODUCT_SERVICES),product_services)

  BOARD_USES_PRODUCT_SERVICESIMAGE := true

  BOARD_USES_PRODUCT_SERVICESIMAGE := true

else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE

else ifdef BOARD_USES_PRODUCT_SERVICESIMAGE

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

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

endif

endif





BUILDING_PRODUCT_SERVICES_IMAGE :=

BUILDING_PRODUCT_SERVICES_IMAGE :=