summaryrefslogtreecommitdiffstats
path: root/compatibility_matrices/Android.mk
diff options
context:
space:
mode:
authorYifan Hong <elsk@google.com>2018-03-29 10:06:10 -0700
committerYifan Hong <elsk@google.com>2018-03-29 11:29:32 -0700
commit3693fe4ab595d8059d5135f2dfbed04d53f22861 (patch)
tree8e18815bdcc6c4add876871c8435ae12f9d7f01c /compatibility_matrices/Android.mk
parente0cad7a553986bc4e31a193c12602182b4985cdd (diff)
downloadplatform_hardware_interfaces-3693fe4ab595d8059d5135f2dfbed04d53f22861.tar.gz
platform_hardware_interfaces-3693fe4ab595d8059d5135f2dfbed04d53f22861.tar.bz2
platform_hardware_interfaces-3693fe4ab595d8059d5135f2dfbed04d53f22861.zip
matrix: generalize case for LOCAL_WARN_REQUIRED_HALS
Add LOCAL_ASSEMBLE_VINTF_ENV_VARS_OVERRIDE and LOCAL_ASSEMBLE_VINTF_ERROR_MESSAGE for a more generic case. Test: m framework_compatibility_matrix.xml -j Bug: 65028233 Change-Id: Iec142d161daa18122e7a6daebb82c7230cb98ba6
Diffstat (limited to 'compatibility_matrices/Android.mk')
-rw-r--r--compatibility_matrices/Android.mk6
1 files changed, 4 insertions, 2 deletions
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index d24d8e9ff8..dd7165d55f 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -21,8 +21,9 @@ BUILD_FRAMEWORK_COMPATIBILITY_MATRIX := $(LOCAL_PATH)/compatibility_matrix.mk
# Clear potential input variables to BUILD_FRAMEWORK_COMPATIBILITY_MATRIX
LOCAL_ADD_VBMETA_VERSION :=
LOCAL_ASSEMBLE_VINTF_ENV_VARS :=
+LOCAL_ASSEMBLE_VINTF_ENV_VARS_OVERRIDE :=
+LOCAL_ASSEMBLE_VINTF_ERROR_MESSAGE :=
LOCAL_ASSEMBLE_VINTF_FLAGS :=
-LOCAL_WARN_REQUIRED_HALS :=
LOCAL_KERNEL_VERSIONS :=
LOCAL_GEN_FILE_DEPENDENCIES :=
@@ -99,7 +100,8 @@ LOCAL_ASSEMBLE_VINTF_ENV_VARS := \
PLATFORM_SEPOLICY_VERSION \
PLATFORM_SEPOLICY_COMPAT_VERSIONS
-LOCAL_WARN_REQUIRED_HALS := \
+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)