commit dcbd63920b9c7658dcc9c5f73908b6e963ada582
author Yifan Hong <elsk@google.com> Mon Jul 30 10:55:25 2018 -0700
committer android-build-merger <android-build-merger@google.com> Mon Jul 30 10:55:25 2018 -0700
tree 0a855930e75b0e694c35ed76c47c53a90e566481
parent f6fa2f0f44d1b33c809c14cd66722b56277b4a7a
parent 5b97350e31145350aacc2c727c48e0b6d7ac14e5

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

Change-Id: I60a2557ccab2873a3d2696698f6632188d6cffde

compatibility_matrices/Android.mk

diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index 4e610a7..3051c53 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -154,6 +154,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)