commit 5c2a8265c6821263e018c59b36fd8d4772546bb2
author android-build-prod (mdb) <android-build-team-robot@google.com> Mon May 07 18:07:21 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon May 07 18:07:21 2018 +0000
tree 94be2a8df9952e1894621b9f7ac75b5a15be1979
parent 515324a7a455c15dcad7902d456e9c32bc19b13b
parent 521d15c537b410c62cbe0e65c37c6a902f056a81

Merge changes from topic "lazy-dumpstate"

* changes:
  Make dumpstate HAL lazy.
  dumpstate: add interface into rc file

compatibility_matrices/Android.mk

diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index bb41ac4..6446beb 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -113,10 +113,6 @@
     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,17 +135,7 @@
 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)
+BUILT_SYSTEM_MATRIX := $(LOCAL_BUILT_MODULE)
 
 BUILD_FRAMEWORK_COMPATIBILITY_MATRIX :=