commit dce130f2510561096a7b5c7bf64a4bea1bc874b5
author Anton Hansson <hansson@google.com> Thu May 16 02:44:21 2019 -0700
committer android-build-merger <android-build-merger@google.com> Thu May 16 02:44:21 2019 -0700
tree 6fca769400a704af0f508a16db6638095282420a
parent b573bc3eb7c303e8442c53fa0490fabd41f8d468
parent 43b86c0182ceac129c0d2665cc9a74f4f1a64764

Merge "Move default setting of a product variable" into qt-dev
am: 43b86c0182

Change-Id: I4ff87c28d74c5655f3deea7c112ff42712a7f5e9

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 42e57a9..109957f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -808,15 +808,6 @@
     PLATFORM_SEPOLICY_VERSION \
     TOT_SEPOLICY_VERSION \
 
-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
-    endif
-  endif
-endif
-.KATI_READONLY := PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS
-
 ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)
   ifneq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)
     $(error PRODUCT_USE_DYNAMIC_PARTITIONS must be true when PRODUCT_RETROFIT_DYNAMIC_PARTITIONS \

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index a088f06..9460357 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -376,6 +376,14 @@
   PRODUCT_BUILD_SUPER_PARTITION := $(PRODUCT_USE_DYNAMIC_PARTITIONS)
 endif
 
+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
+    endif
+  endif
+endif
+
 define product-overrides-config
 $$(foreach rule,$$(PRODUCT_$(1)_OVERRIDES),\
     $$(if $$(filter 2,$$(words $$(subst :,$$(space),$$(rule)))),,\