Merge "Fwk matrix use PLATFORM_SEPOLICY_*" am: 8f7ff5730b

am: 9dda065989

Change-Id: I3c2253dd252773e28cd0198aafcc25097923035a
This commit is contained in:
Yifan Hong
2018-02-07 22:53:40 +00:00
committed by android-build-merger
2 changed files with 4 additions and 3 deletions

View File

@@ -61,8 +61,9 @@ LOCAL_MODULE_STEM := compatibility_matrix.empty.xml
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)

View File

@@ -78,7 +78,7 @@ my_matrix_src_files := \
$(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 $@ \