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

Commit 78ae2613 authored Jul 24, 2018 by Yifan Hong

BOARD_SUPER_PARTITION_PARTITION_LIST check moved to config.mk

... because variable checks should go there.

Test: pass
Change-Id: I484f928d848fd4f3b3936d1c7fd03976ee64feb2

parent 28af1e74

core/Makefile

+0 −8

Original line number	Original line	Diff line number	Diff line
	@@ -2570,14 +2570,6 @@ droid_targets: check_android_partition_sizes

	.PHONY: 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.		# Add image dependencies so that generated_*_image_info.txt are written before checking.
	ifneq (,$(filter system,$(BOARD_SUPER_PARTITION_PARTITION_LIST)))		ifneq (,$(filter system,$(BOARD_SUPER_PARTITION_PARTITION_LIST)))
	check_android_partition_sizes: $(BUILT_SYSTEMIMAGE)		check_android_partition_sizes: $(BUILT_SYSTEMIMAGE)

core/config.mk

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -945,6 +945,16 @@ $(error Should not define BOARD_PRODUCT_SERVICESIMAGE_PARTITION_SIZE and \
	endif		endif
	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		endif # USE_LOGICAL_PARTITIONS

	# ###############################################################		# ###############################################################