commit 0e193786e89847e05e52e2e6908ef337f4912259
author Yifan Hong <elsk@google.com> Mon Jul 30 10:38:43 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 30 10:38:43 2018 -0700
tree 99f99952dcb398f67262461805daad1f8888ea85
parent 51a75aed34b8b556f188e7c7ca0704a8a882275e
parent 0084639ada81ff484da9dfd0af4ab4b84d61f411

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

Change-Id: Iad98f059fd3a15a7bd5dffa1c53300340e3f9e19

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)