openkylin
/
platform_build
mirror of https://gitee.com/openkylin/platform_build.git
9
0
Fork 1
Code Issues Projects Releases Wiki Activity

Merge "PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS: allow inheritance"

This commit is contained in:
Treehugger Robot 2018-11-21 00:41:44 +00:00 committed by Gerrit Code Review
parent d585de5933 452d9267fc
commit b906ebb313
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/config.mk
View File

@ -923,12 +923,7 @@ PLATFORM_SEPOLICY_COMPAT_VERSIONS := \
PLATFORM_SEPOLICY_VERSION \ PLATFORM_SEPOLICY_VERSION \
TOT_SEPOLICY_VERSION \ TOT_SEPOLICY_VERSION \
# If true, kernel configuration requirements are present in OTA package (and will be enforced ifeq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),)
# during OTA). Otherwise, kernel configuration requirements are enforced in VTS.
# Devices that checks the running kernel (instead of the kernel in OTA package) should not
# set this variable to prevent OTA failures.
ifndef PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS :=
ifdef PRODUCT_SHIPPING_API_LEVEL ifdef PRODUCT_SHIPPING_API_LEVEL
ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29)) ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29))
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true

1
core/product.mk
View File

@ -211,6 +211,7 @@ _product_var_list := \
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION \ PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION \
PRODUCT_USE_DYNAMIC_PARTITIONS \ PRODUCT_USE_DYNAMIC_PARTITIONS \
PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \ PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS \
define dump-product define dump-product
$(info ==== $(1) ====)\ $(info ==== $(1) ====)\

7
core/product_config.mk
View File

@ -544,3 +544,10 @@ PRODUCT_BUILD_SUPER_PARTITION := $(or \
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION := \ PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION)) $(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION))
.KATI_READONLY := PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION .KATI_READONLY := PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION
# If set, kernel configuration requirements are present in OTA package (and will be enforced
# during OTA). Otherwise, kernel configuration requirements are enforced in VTS.
# Devices that checks the running kernel (instead of the kernel in OTA package) should not
# set this variable to prevent OTA failures.
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS))