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

Remove USE_LOGICAL_PARTITIONS override

Browse Source 
... so that its requirements does not fallback
on the overridden USE_LOGICAL_PARTITIONS, but
PRODUCT_USE_LOGICAL_PARTITIONS.

Test: m superimage -j
Change-Id: Ib14aaf83cc8bd4336125d503d11c69a60566530e
This commit is contained in:
Yifan Hong
2018-07-31 13:30:38 -07:00
parent d1c308bf40
commit a42e5f976d
4 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/Makefile
View File

@@ -1157,7 +1157,7 @@ ifeq ($(INTERNAL_USERIMAGES_USE_EXT),true)
INTERNAL_USERIMAGES_DEPS += $(MKE2FS_CONF) INTERNAL_USERIMAGES_DEPS += $(MKE2FS_CONF)
endif endif
ifeq (true,$(USE_LOGICAL_PARTITIONS)) ifeq (true,$(PRODUCT_USE_LOGICAL_PARTITIONS))
ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),true) ifeq ($(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY),true)
$(error vboot 1.0 doesn't support logical partition) $(error vboot 1.0 doesn't support logical partition)
@@ -1166,7 +1166,7 @@ endif
# TODO(b/80195851): Should not define BOARD_AVB_SYSTEM_KEY_PATH without # TODO(b/80195851): Should not define BOARD_AVB_SYSTEM_KEY_PATH without
# BOARD_AVB_SYSTEM_DETACHED_VBMETA. # BOARD_AVB_SYSTEM_DETACHED_VBMETA.
endif # USE_LOGICAL_PARTITIONS endif # PRODUCT_USE_LOGICAL_PARTITIONS
# $(1): the path of the output dictionary file # $(1): the path of the output dictionary file
# $(2): a subset of "system vendor cache userdata product product_services oem" # $(2): a subset of "system vendor cache userdata product product_services oem"

4
core/config.mk
View File

@@ -925,14 +925,14 @@ ifndef PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS
endif endif
.KATI_READONLY := PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS .KATI_READONLY := PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS
ifeq ($(USE_LOGICAL_PARTITIONS),true) ifeq ($(PRODUCT_USE_LOGICAL_PARTITIONS),true)
requirements := \ requirements := \
PRODUCT_USE_DYNAMIC_PARTITION_SIZE \ PRODUCT_USE_DYNAMIC_PARTITION_SIZE \
PRODUCT_BUILD_SUPER_PARTITION \ PRODUCT_BUILD_SUPER_PARTITION \
PRODUCT_USE_FASTBOOTD \ PRODUCT_USE_FASTBOOTD \
$(foreach req,$(requirements),$(if $(filter false,$($(req))),\ $(foreach req,$(requirements),$(if $(filter false,$($(req))),\
$(error USE_LOGICAL_PARTITIONS requires $(req) to be true))) $(error PRODUCT_USE_LOGICAL_PARTITIONS requires $(req) to be true)))
requirements := requirements :=

2
core/main.mk
View File

@@ -240,7 +240,7 @@ else
ADDITIONAL_DEFAULT_PROPERTIES += ro.actionable_compatible_property.enabled=${PRODUCT_COMPATIBLE_PROPERTY} ADDITIONAL_DEFAULT_PROPERTIES += ro.actionable_compatible_property.enabled=${PRODUCT_COMPATIBLE_PROPERTY}
endif endif
ADDITIONAL_PRODUCT_PROPERTIES += ro.boot.logical_partitions=$(USE_LOGICAL_PARTITIONS) ADDITIONAL_PRODUCT_PROPERTIES += ro.boot.logical_partitions=$(PRODUCT_USE_LOGICAL_PARTITIONS)
# ----------------------------------------------------------------- # -----------------------------------------------------------------
### ###

13
core/product_config.mk
View File

@@ -519,21 +519,18 @@ PRODUCT_ACTIONABLE_COMPATIBLE_PROPERTY_DISABLE := \
PRODUCT_USE_LOGICAL_PARTITIONS := \ PRODUCT_USE_LOGICAL_PARTITIONS := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_LOGICAL_PARTITIONS)) $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_LOGICAL_PARTITIONS))
.KATI_READONLY := PRODUCT_USE_LOGICAL_PARTITIONS .KATI_READONLY := PRODUCT_USE_LOGICAL_PARTITIONS
ifndef USE_LOGICAL_PARTITIONS
USE_LOGICAL_PARTITIONS := $(PRODUCT_USE_LOGICAL_PARTITIONS)
endif
# All requirements of USE_LOGICAL_PARTITIONS falls back to # All requirements of PRODUCT_USE_LOGICAL_PARTITIONS falls back to
# USE_LOGICAL_PARTITIONS if not defined. # PRODUCT_USE_LOGICAL_PARTITIONS if not defined.
PRODUCT_USE_DYNAMIC_PARTITION_SIZE := $(or \ PRODUCT_USE_DYNAMIC_PARTITION_SIZE := $(or \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_DYNAMIC_PARTITION_SIZE)),\ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_DYNAMIC_PARTITION_SIZE)),\
$(USE_LOGICAL_PARTITIONS)) $(PRODUCT_USE_LOGICAL_PARTITIONS))
.KATI_READONLY := PRODUCT_USE_DYNAMIC_PARTITION_SIZE .KATI_READONLY := PRODUCT_USE_DYNAMIC_PARTITION_SIZE
PRODUCT_BUILD_SUPER_PARTITION := $(or \ PRODUCT_BUILD_SUPER_PARTITION := $(or \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BUILD_SUPER_PARTITION)),\ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_BUILD_SUPER_PARTITION)),\
$(USE_LOGICAL_PARTITIONS)) $(PRODUCT_USE_LOGICAL_PARTITIONS))
.KATI_READONLY := PRODUCT_BUILD_SUPER_PARTITION .KATI_READONLY := PRODUCT_BUILD_SUPER_PARTITION
PRODUCT_USE_FASTBOOTD := $(or \ PRODUCT_USE_FASTBOOTD := $(or \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_FASTBOOTD)),\ $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_USE_FASTBOOTD)),\
$(USE_LOGICAL_PARTITIONS)) $(PRODUCT_USE_LOGICAL_PARTITIONS))
.KATI_READONLY := PRODUCT_USE_FASTBOOTD .KATI_READONLY := PRODUCT_USE_FASTBOOTD