diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index dd7165d55f..23be7de2f9 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -127,6 +127,14 @@ endif LOCAL_ASSEMBLE_VINTF_ENV_VARS := PRODUCT_ENFORCE_VINTF_MANIFEST +# TODO(b/65028233): Enforce no "unused HALs" for devices that does not define +# DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE as well +ifeq (true,$(strip $(PRODUCT_ENFORCE_VINTF_MANIFEST))) +ifdef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE +LOCAL_ASSEMBLE_VINTF_ENV_VARS_OVERRIDE := VINTF_ENFORCE_NO_UNUSED_HALS=true +endif +endif + include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) BUILT_SYSTEM_COMPATIBILITY_MATRIX := $(LOCAL_BUILT_MODULE)