tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS: allow inheritance"

Browse source 
am: b906ebb313

Change-Id: I439ef709e9f997d01cc11d797346a7c0a44d88ed
This commit is contained in:
Yifan Hong 2018-11-20 16:51:07 -08:00 committed by android-build-merger
commit cb6923e4eb
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 \
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 :=
ifeq ($(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

1
core/product.mk
View file

@ -211,6 +211,7 @@ _product_var_list := \
PRODUCT_FORCE_PRODUCT_MODULES_TO_SYSTEM_PARTITION \
PRODUCT_USE_DYNAMIC_PARTITIONS \
PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \
PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS \
define dump-product
$(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 := \
$(strip $(PRODUCTS.$(INTERNAL_PRODUCT).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))