commit b906ebb313b9c36f8063df5b52609c19935d701e
author Treehugger Robot <treehugger-gerrit@google.com> Wed Nov 21 00:41:44 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Nov 21 00:41:44 2018 +0000
tree 61a2738a48a6c37acd746b69a6b2962752b65107
parent d585de5933aa44f30bf6538b637f3d6f1cb2ff65
parent 452d9267fc44245c7e211fa04dc373b72f43bd3f

Merge "PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS: allow inheritance"

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 0c2b8c7..77f5e6b 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -923,12 +923,7 @@
     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

core/product.mk

diff --git a/core/product.mk b/core/product.mk
index 491f916..7d5f9b3 100644
--- a/core/product.mk
+++ b/core/product.mk
@@ -211,6 +211,7 @@
     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) ====)\

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index 177978c..d4275d2 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -544,3 +544,10 @@
 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))