From 78ae26132d42e37059004f02693e23827f5ba47f Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Tue, 24 Jul 2018 17:44:18 -0700 Subject: [PATCH] BOARD_SUPER_PARTITION_PARTITION_LIST check moved to config.mk ... because variable checks should go there. Test: pass Change-Id: I484f928d848fd4f3b3936d1c7fd03976ee64feb2 --- core/Makefile | 8 -------- core/config.mk | 10 ++++++++++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/core/Makefile b/core/Makefile index 3968ac333c..4fe88fb89c 100644 --- a/core/Makefile +++ b/core/Makefile @@ -2570,14 +2570,6 @@ droid_targets: check_android_partition_sizes .PHONY: check_android_partition_sizes -# BOARD_SUPER_PARTITION_PARTITION_LIST: a list of the following tokens -valid_super_partition_list := system vendor product productservices -ifneq (,$(filter-out $(valid_super_partition_list),$(BOARD_SUPER_PARTITION_PARTITION_LIST))) -$(error BOARD_SUPER_PARTITION_PARTITION_LIST contains invalid partition name. \ - Valid names are $(valid_super_partition_list).) -endif -valid_super_partition_list := - # Add image dependencies so that generated_*_image_info.txt are written before checking. ifneq (,$(filter system,$(BOARD_SUPER_PARTITION_PARTITION_LIST))) check_android_partition_sizes: $(BUILT_SYSTEMIMAGE) diff --git a/core/config.mk b/core/config.mk index 5ebbd9c3a2..b7232a30fc 100644 --- a/core/config.mk +++ b/core/config.mk @@ -945,6 +945,16 @@ $(error Should not define BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE and \ endif endif +ifdef BOARD_SUPER_PARTITION_PARTITION_LIST +# BOARD_SUPER_PARTITION_PARTITION_LIST: a list of the following tokens +valid_super_partition_list := system vendor product productservices +ifneq (,$(filter-out $(valid_super_partition_list),$(BOARD_SUPER_PARTITION_PARTITION_LIST))) +$(error BOARD_SUPER_PARTITION_PARTITION_LIST contains invalid partition name. \ + Valid names are $(valid_super_partition_list).) +endif +valid_super_partition_list := +endif # BOARD_SUPER_PARTITION_PARTITION_LIST + endif # USE_LOGICAL_PARTITIONS # ###############################################################