From f529c34cc47babdcbe4669c93e8052b664c72cb3 Mon Sep 17 00:00:00 2001 From: Yifan Hong Date: Thu, 26 Jul 2018 11:42:17 -0700 Subject: [PATCH] matrix: Enforce kernel requirements in OTA only when flag is set. Enforce only when PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS is set. If a device does want to require kernel configs, it has to provide info for new kernel in OTA package. Bug: 111840577 Test: build and manual inspection Change-Id: I36b3fcd9d14a9795aaf8d020bba6180c5e8681d1 --- compatibility_matrices/Android.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index cadf85b4c8..826c25457f 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -141,6 +141,10 @@ LOCAL_GEN_FILE_DEPENDENCIES += $(BUILT_VENDOR_MANIFEST) LOCAL_ASSEMBLE_VINTF_FLAGS += -c "$(BUILT_VENDOR_MANIFEST)" endif +ifneq ($(PRODUCT_OTA_ENFORCE_VINTF_KERNEL_REQUIREMENTS),true) +LOCAL_ASSEMBLE_VINTF_FLAGS += --no-kernel-requirements +endif + include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) BUILT_SYSTEM_MATRIX := $(LOCAL_BUILT_MODULE)