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

Commit 01fa11cf authored Jul 26, 2018 by Yifan Hong Committed by android-build-merger Jul 26, 2018

Merge "BOARD_SUPER_PARTITION_PARTITION_LIST check moved to config.mk" am: df899f64

am: 2843e2e1

Change-Id: I5d01fbdc0378c4bcd346e828022d67923b247503

parents 40f0e6df 2843e2e1

core/Makefile

+0 −8

Original line number	Diff line number	Diff line
		@@ -2572,14 +2572,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)

core/config.mk

+10 −0

Original line number	Diff line number	Diff line
		@@ -969,6 +969,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

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