Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 777d18cc authored by Yifan Hong's avatar Yifan Hong Committed by android-build-merger
Browse files

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

am: 9dda0659

Change-Id: I3c2253dd252773e28cd0198aafcc25097923035a
parents 01209017 9dda0659

compatibility_matrices/Android.mk

+3 −2
Original line number Diff line number Diff line
@@ -62,7 +62,8 @@ LOCAL_SRC_FILES := $(LOCAL_MODULE_STEM) 
LOCAL_ADD_VBMETA_VERSION := true

LOCAL_ASSEMBLE_VINTF_ENV_VARS := \

    POLICYVERS \

	BOARD_SEPOLICY_VERS

    PLATFORM_SEPOLICY_VERSION \

    PLATFORM_SEPOLICY_COMPAT_VERSIONS



include $(BUILD_FRAMEWORK_COMPATIBILITY_MATRIX)

compatibility_matrices/compatibility_matrix.mk

+1 −1
Original line number Diff line number Diff line
@@ -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 $@ \