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

Commit 067b104e authored by Yifan Hong's avatar Yifan Hong Committed by Automerger Merge Worker
Browse files

Merge "Revert "Check system manifest against frozen data."" am: d7c6f4f9 am:... 

Merge "Revert "Check system manifest against frozen data."" am: d7c6f4f9 am: d6289145 am: 99b999c6

Original change: https://android-review.googlesource.com/c/platform/build/+/1467028

Change-Id: Ia54906518e9c6b368d81abcc3c02e22d5a618771
parents 0daa4c45 99b999c6

core/Makefile

+0 −8
Original line number Diff line number Diff line
@@ -3612,19 +3612,11 @@ endif 
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 :=