Remove early checks on manifest.

am: a5cca55a1f

Change-Id: If1fb3ae17dbb2d0d71f472536c7a5ad049c37561
This commit is contained in:
Steven Moreland
2018-05-02 18:24:44 -07:00
committed by android-build-merger

View File

@@ -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)