Merge "VINTF logs ends in .log suffix." (3eca99ee) · Commits · e / os / android_build

core/Makefile

+4 −4

Original line number	Diff line number	Diff line
		@@ -3840,13 +3840,13 @@ check_vintf_system_deps := $(filter $(TARGET_OUT)/etc/vintf/%, $(check_vintf_com
		ifneq ($(check_vintf_system_deps),)
		check_vintf_has_system := true

		check_vintf_system_log := $(intermediates)/check_vintf_system_log
		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
		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) \
		@@ -3859,7 +3859,7 @@ check_vintf_system_deps :=
		check_vintf_vendor_deps := $(filter $(TARGET_OUT_VENDOR)/etc/vintf/%, $(check_vintf_common_srcs))
		ifneq ($(check_vintf_vendor_deps),)
		check_vintf_has_vendor := true
		check_vintf_vendor_log := $(intermediates)/check_vintf_vendor_log
		check_vintf_vendor_log := $(intermediates)/check_vintf_vendor.log
		check_vintf_all_deps += $(check_vintf_vendor_log)
		# Check vendor SKU=(empty) case when:
		# - DEVICE_MANIFEST_FILE is not empty; OR
		@@ -3889,7 +3889,7 @@ ifeq ($(filter true,$(BUILDING_ODM_IMAGE)),$(filter true,$(BOARD_USES_ODMIMAGE))
		ifeq ($(filter true,$(BUILDING_PRODUCT_IMAGE)),$(filter true,$(BOARD_USES_PRODUCTIMAGE)))
		ifeq ($(filter true,$(BUILDING_SYSTEM_EXT_IMAGE)),$(filter true,$(BOARD_USES_SYSTEM_EXTIMAGE)))

		check_vintf_compatible_log := $(intermediates)/check_vintf_compatible_log
		check_vintf_compatible_log := $(intermediates)/check_vintf_compatible.log
		check_vintf_all_deps += $(check_vintf_compatible_log)

		check_vintf_compatible_args :=