p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge "Reland "Check system manifest against frozen data."" am: 3dd40ccebe 

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

Change-Id: I7f122f851c160da7f4d3b97293d5a3c987786eba
This commit is contained in:
Yifan Hong 2020-10-20 20:41:58 +00:00 committed by Automerger Merge Worker
parent fe4c812bad 3dd40ccebe
commit c75703ca98
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/Makefile
View File

@ -3612,11 +3612,19 @@ endif
check_vintf_system_deps := $(filter $(TARGET_OUT)/etc/vintf/%, $(check_vintf_common_srcs)) check_vintf_system_deps := $(filter $(TARGET_OUT)/etc/vintf/%, $(check_vintf_common_srcs))
ifneq ($(check_vintf_system_deps),) ifneq ($(check_vintf_system_deps),)
check_vintf_has_system := true 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_all_deps += $(check_vintf_system_log)
$(check_vintf_system_log): $(HOST_OUT_EXECUTABLES)/checkvintf $(check_vintf_system_deps) $(check_vintf_system_log): $(HOST_OUT_EXECUTABLES)/checkvintf $(check_vintf_system_deps)
@( $< --check-one --dirmap /system:$(TARGET_OUT) > $@ 2>&1 ) || ( cat $@ && exit 1 ) @( $< --check-one --dirmap /system:$(TARGET_OUT) > $@ 2>&1 ) || ( cat $@ && exit 1 )
check_vintf_system_log := 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 endif # check_vintf_system_deps
check_vintf_system_deps := check_vintf_system_deps :=