commit 5b97350e31145350aacc2c727c48e0b6d7ac14e5
author Yifan Hong <elsk@google.com> Mon Jul 30 10:48:11 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 30 10:48:11 2018 -0700
tree cad9a85c67b7b49746696723faec4f0287a57326
parent 8b472da4ba03ce1d868872b67a690c78925c61e3
parent 707b4be33ce9ceddaff1acb443efa6e0f84c3c28

Merge "matrix: Enforce kernel requirements in OTA only when flag is set." am: 0084639ada am: 0e193786e8
am: 707b4be33c

Change-Id: Iba9f19fd95c5b6fcf1248808b76042f84e203ff3

compatibility_matrices/Android.mk

diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index 094b35d..bf2e447 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -141,6 +141,10 @@
 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)