Merge "Add PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS."

am: 4f85bace12

Change-Id: I01718232aa2de09b46785d029bdd70ff59b8d9d6
This commit is contained in:
Yifan Hong
2018-07-30 10:38:33 -07:00
committed by android-build-merger

View File

@@ -933,6 +933,20 @@ 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
# 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
ifeq (true,$(call math_gt_or_eq,$(PRODUCT_SHIPPING_API_LEVEL),29))
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS := true
endif
endif
endif
.KATI_READONLY := PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS
ifndef USE_LOGICAL_PARTITIONS ifndef USE_LOGICAL_PARTITIONS
USE_LOGICAL_PARTITIONS := $(PRODUCT_USE_LOGICAL_PARTITIONS) USE_LOGICAL_PARTITIONS := $(PRODUCT_USE_LOGICAL_PARTITIONS)
endif endif