commit 707b4be33ce9ceddaff1acb443efa6e0f84c3c28
author Yifan Hong <elsk@google.com> Mon Jul 30 10:42:58 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 30 10:42:58 2018 -0700
tree 90f18cdab7ede3d6c1dd28b2eff73a022cc9f4f6
parent 3f777580ad2b6356c963d0daad0e27c15b649ef8
parent 0e193786e89847e05e52e2e6908ef337f4912259

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

Change-Id: Icdd6ae9a045e801806fdfd449f7d36fd8f50c7d3

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)