summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Moreland2018-04-30 18:23:44 -0500
committerSteven Moreland2018-05-01 20:36:30 -0500
commita5cca55a1fa549a93774a788a1843b1f1fcf198d (patch)
treebde145f3b789ae560f5ed1384d0afbb1a2c27f03 /compatibility_matrices
parenta6a1e0b2d26b8fc39b3c000904151676d55125b7 (diff)
downloadplatform-hardware-interfaces-a5cca55a1fa549a93774a788a1843b1f1fcf198d.tar.gz
platform-hardware-interfaces-a5cca55a1fa549a93774a788a1843b1f1fcf198d.tar.xz
platform-hardware-interfaces-a5cca55a1fa549a93774a788a1843b1f1fcf198d.zip
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
Diffstat (limited to 'compatibility_matrices')
-rw-r--r--compatibility_matrices/Android.mk14
1 files changed, 0 insertions, 14 deletions
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index bb41ac4f..6b40766b 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -113,10 +113,6 @@ LOCAL_ASSEMBLE_VINTF_ENV_VARS := \
113 PLATFORM_SEPOLICY_VERSION \ 113 PLATFORM_SEPOLICY_VERSION \
114 PLATFORM_SEPOLICY_COMPAT_VERSIONS 114 PLATFORM_SEPOLICY_COMPAT_VERSIONS
115 115
116LOCAL_ASSEMBLE_VINTF_ENV_VARS_OVERRIDE := PRODUCT_ENFORCE_VINTF_MANIFEST=true
117LOCAL_ASSEMBLE_VINTF_ERROR_MESSAGE := \
118 "Error: DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX cannot contain required HALs."
119
120include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) 116include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
121 117
122# Framework Compatibility Matrix 118# Framework Compatibility Matrix
@@ -139,16 +135,6 @@ LOCAL_GEN_FILE_DEPENDENCIES += $(BUILT_VENDOR_MANIFEST)
139LOCAL_ASSEMBLE_VINTF_FLAGS += -c "$(BUILT_VENDOR_MANIFEST)" 135LOCAL_ASSEMBLE_VINTF_FLAGS += -c "$(BUILT_VENDOR_MANIFEST)"
140endif 136endif
141 137
142LOCAL_ASSEMBLE_VINTF_ENV_VARS := PRODUCT_ENFORCE_VINTF_MANIFEST
143
144# TODO(b/65028233): Enforce no "unused HALs" for devices that does not define
145# DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE as well
146ifeq (true,$(strip $(PRODUCT_ENFORCE_VINTF_MANIFEST)))
147ifdef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE
148LOCAL_ASSEMBLE_VINTF_ENV_VARS_OVERRIDE := VINTF_ENFORCE_NO_UNUSED_HALS=true
149endif
150endif
151
152include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX) 138include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
153BUILT_SYSTEM_COMPATIBILITY_MATRIX := $(LOCAL_BUILT_MODULE) 139BUILT_SYSTEM_COMPATIBILITY_MATRIX := $(LOCAL_BUILT_MODULE)
154 140