StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Change-Id: I305b453d2d07fc8dc5c9262492462d87cb051fe6
This commit is contained in:
Yifan Hong
2020-10-20 03:40:10 +00:00
committed by Automerger Merge Worker
parent 05f36ecf89 d7c6f4f966
commit d62891451d
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@@ -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 :=