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

Merge "Allow disabling building super partition for DAP devices" am: 1bc36fa328

Browse Source 
am: 0aa34b44a1

Change-Id: Ic4c59f377983a4c990be21043510ab20adf52877
This commit is contained in:
Daniel Norman
2019-03-19 15:29:15 -07:00
committed by android-build-merger
parent 3e9a4b096e 0aa34b44a1
commit 29631f22fe
1 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
core/config.mk
View File

@@ -836,17 +836,18 @@ ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true) ifeq ($(BOARD_BUILD_SYSTEM_ROOT_IMAGE),true)
$(error BOARD_BUILD_SYSTEM_ROOT_IMAGE cannot be true for devices with dynamic partitions) $(error BOARD_BUILD_SYSTEM_ROOT_IMAGE cannot be true for devices with dynamic partitions)
endif endif
ifneq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)
requirements := \ $(error PRODUCT_USE_DYNAMIC_PARTITION_SIZE must be true for devices with dynamic partitions)
PRODUCT_USE_DYNAMIC_PARTITION_SIZE \ endif
PRODUCT_BUILD_SUPER_PARTITION \
$(foreach req,$(requirements),$(if $(filter false,$($(req))),\
$(error PRODUCT_USE_DYNAMIC_PARTITIONS requires $(req) to be true)))
requirements :=
endif endif
ifeq ($(PRODUCT_BUILD_SUPER_PARTITION),true)
ifneq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
$(error Can only build super partition for devices with dynamic partitions)
endif
endif
ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true) ifeq ($(PRODUCT_USE_DYNAMIC_PARTITION_SIZE),true)
ifneq ($(BOARD_SYSTEMIMAGE_PARTITION_SIZE),) ifneq ($(BOARD_SYSTEMIMAGE_PARTITION_SIZE),)
@@ -886,7 +887,7 @@ endif
endif # PRODUCT_USE_DYNAMIC_PARTITION_SIZE endif # PRODUCT_USE_DYNAMIC_PARTITION_SIZE
ifeq ($(PRODUCT_BUILD_SUPER_PARTITION),true) ifeq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
# BOARD_SUPER_PARTITION_GROUPS defines a list of "updatable groups". Each updatable group is a # BOARD_SUPER_PARTITION_GROUPS defines a list of "updatable groups". Each updatable group is a
# group of partitions that share the same pool of free spaces. # group of partitions that share the same pool of free spaces.
@@ -897,12 +898,16 @@ ifeq ($(PRODUCT_BUILD_SUPER_PARTITION),true)
# - BOARD_{GROUP}_PARTITION_PARTITION_LIST: the list of partitions that belongs to this group. # - BOARD_{GROUP}_PARTITION_PARTITION_LIST: the list of partitions that belongs to this group.
# If empty, no partitions belong to this group, and the sum of sizes is effectively 0. # If empty, no partitions belong to this group, and the sum of sizes is effectively 0.
$(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \ $(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \
$(eval BOARD_$(group)_SIZE := $(strip $(BOARD_$(group)_SIZE))) \
$(if $(BOARD_$(group)_SIZE),,$(error BOARD_$(group)_SIZE must not be empty)) \
$(eval .KATI_READONLY := BOARD_$(group)_SIZE) \
$(eval BOARD_$(group)_PARTITION_LIST ?=) \ $(eval BOARD_$(group)_PARTITION_LIST ?=) \
$(eval .KATI_READONLY := BOARD_$(group)_PARTITION_LIST) \ $(eval .KATI_READONLY := BOARD_$(group)_PARTITION_LIST) \
) )
ifeq ($(PRODUCT_BUILD_SUPER_PARTITION),true)
$(foreach group,$(call to-upper,$(BOARD_SUPER_PARTITION_GROUPS)), \
$(eval BOARD_$(group)_SIZE := $(strip $(BOARD_$(group)_SIZE))) \
$(if $(BOARD_$(group)_SIZE),,$(error BOARD_$(group)_SIZE must not be empty)) \
$(eval .KATI_READONLY := BOARD_$(group)_SIZE) \
)
endif # PRODUCT_BUILD_SUPER_PARTITION
# BOARD_*_PARTITION_LIST: a list of the following tokens # BOARD_*_PARTITION_LIST: a list of the following tokens
valid_super_partition_list := system vendor product product_services odm valid_super_partition_list := system vendor product product_services odm
@@ -924,6 +929,10 @@ BOARD_SUPER_PARTITION_PARTITION_LIST := \
$(BOARD_$(group)_PARTITION_LIST)) $(BOARD_$(group)_PARTITION_LIST))
.KATI_READONLY := BOARD_SUPER_PARTITION_PARTITION_LIST .KATI_READONLY := BOARD_SUPER_PARTITION_PARTITION_LIST
endif # PRODUCT_USE_DYNAMIC_PARTITIONS
ifeq ($(PRODUCT_BUILD_SUPER_PARTITION),true)
ifneq ($(BOARD_SUPER_PARTITION_SIZE),) ifneq ($(BOARD_SUPER_PARTITION_SIZE),)
ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true) ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)