diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-09 03:07:11 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-07-09 03:07:11 +0000 |
| commit | 687e845c10b23c9d83074e0956aed03f8184b1f9 (patch) | |
| tree | a34b6437ef7465ed1704fc276c7712166a178747 | |
| parent | fd33eac3ed34779c7b13cc31f0d8618109139744 (diff) | |
| parent | 25065c44ccce11172ad769f9f7b52aa3938109cb (diff) | |
| download | build-android10-mainline-release.tar.gz | |
Snap for 5713174 from 25065c44ccce11172ad769f9f7b52aa3938109cb to qt-aml-releaseandroid-mainline-10.0.0_r3android-mainline-10.0.0_r1android10-mainline-release
Change-Id: I50e4383a10278fd78dd39dd919857298db48545b
| -rw-r--r-- | core/board_config.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/core/board_config.mk b/core/board_config.mk index d0f0ccfc0d..ac0f27da53 100644 --- a/core/board_config.mk +++ b/core/board_config.mk @@ -397,9 +397,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 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)'.) +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)'.) endif .KATI_READONLY := MERGE_PRODUCT_SERVICES_INTO_PRODUCT 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) BOARD_USES_PRODUCT_SERVICESIMAGE := true 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 BUILDING_PRODUCT_SERVICES_IMAGE := |