Merge "Reland "Check system manifest against frozen data.""

check_vintf_system_deps := $(filter $(TARGET_OUT)/etc/vintf/%, $(check_vintf_common_srcs))

ifneq ($(check_vintf_system_deps),)

check_vintf_has_system := true

check_vintf_system_log := $(intermediates)/check_vintf_system_log

check_vintf_all_deps += $(check_vintf_system_log)

$(check_vintf_system_log): $(HOST_OUT_EXECUTABLES)/checkvintf $(check_vintf_system_deps)

	@( $< --check-one --dirmap /system:$(TARGET_OUT) > $@ 2>&1 ) || ( cat $@ && exit 1 )

check_vintf_system_log :=

vintffm_log := $(intermediates)/vintffm_log

check_vintf_all_deps += $(vintffm_log)

$(vintffm_log): $(HOST_OUT_EXECUTABLES)/vintffm $(check_vintf_system_deps)

	@( $< --check --dirmap /system:$(TARGET_OUT) \

	  $(VINTF_FRAMEWORK_MANIFEST_FROZEN_DIR) > $@ 2>&1 ) || ( cat $@ && exit 1 )

endif # check_vintf_system_deps

check_vintf_system_deps :=