StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "BOARD_SUPER_PARTITION_PARTITION_LIST check moved to config.mk"

Browse Source
This commit is contained in:
Treehugger Robot
2018-07-26 21:44:05 +00:00
committed by Gerrit Code Review
parent aa2abc3324 78ae26132d
commit df899f64d0
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@@ -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)

10
core/config.mk
View File

@@ -946,6 +946,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
# ############################################################### # ###############################################################