From a5cca55a1fa549a93774a788a1843b1f1fcf198d Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Mon, 30 Apr 2018 16:23:44 -0700 Subject: [PATCH] Remove early checks on manifest. These are to be checked in verify_vintf_matrices at the end of the build when all of the manifest fragments are available. Bug: 66917623 Test: check that verify_vintf_matrices hits these checks Change-Id: I3f184a05a6a95751384da077257dddcf73d3a6f2 --- compatibility_matrices/Android.mk | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk index bb41ac4faa..6b40766b21 100644 --- a/compatibility_matrices/Android.mk +++ b/compatibility_matrices/Android.mk @@ -113,10 +113,6 @@ LOCAL_ASSEMBLE_VINTF_ENV_VARS := \ PLATFORM_SEPOLICY_VERSION \ PLATFORM_SEPOLICY_COMPAT_VERSIONS -LOCAL_ASSEMBLE_VINTF_ENV_VARS_OVERRIDE := PRODUCT_ENFORCE_VINTF_MANIFEST=true -LOCAL_ASSEMBLE_VINTF_ERROR_MESSAGE := \ - "Error: DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX cannot contain required HALs." - include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) # Framework Compatibility Matrix @@ -139,16 +135,6 @@ LOCAL_GEN_FILE_DEPENDENCIES += $(BUILT_VENDOR_MANIFEST) LOCAL_ASSEMBLE_VINTF_FLAGS += -c "$(BUILT_VENDOR_MANIFEST)" 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)