Fwk matrix use PLATFORM_SEPOLICY_*
It used BOARD_SEPOLICY_VERS as a workaround, which is incorrect.
Test: m framework_compatibility_matrix.xml -j
Bug: 67920434
Change-Id: I029edd2f573740af272f8b767bb1ec5cc1dc0415
diff --git a/compatibility_matrices/Android.mk b/compatibility_matrices/Android.mk
index 1c86f11..71253da 100644
--- a/compatibility_matrices/Android.mk
+++ b/compatibility_matrices/Android.mk
@@ -61,8 +61,9 @@
LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM)
LOCAL_ADD_VBMETA_VERSION := true
LOCAL_ASSEMBLE_VINTF_ENV_VARS := \
- POLICYVERS \
- BOARD_SEPOLICY_VERS
+ POLICYVERS \
+ PLATFORM_SEPOLICY_VERSION \
+ PLATFORM_SEPOLICY_COMPAT_VERSIONS
include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)
diff --git a/compatibility_matrices/compatibility_matrix.mk b/compatibility_matrices/compatibility_matrix.mk
index 14c60ab..96815b8 100644
--- a/compatibility_matrices/compatibility_matrix.mk
+++ b/compatibility_matrices/compatibility_matrix.mk
@@ -78,7 +78,7 @@
$(GEN): PRIVATE_SRC_FILES := $(my_matrix_src_files)
$(GEN): $(my_matrix_src_files) $(HOST_OUT_EXECUTABLES)/assemble_vintf
- $(foreach varname,$(PRIVATE_ENV_VARS),$(varname)=$($(varname))) \
+ $(foreach varname,$(PRIVATE_ENV_VARS),$(varname)="$($(varname))") \
$(HOST_OUT_EXECUTABLES)/assemble_vintf \
-i $(call normalize-path-list,$(PRIVATE_SRC_FILES)) \
-o $@ \