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

Commit 88e459c5 authored by Devin Moore's avatar Devin Moore Committed by Automerger Merge Worker
Browse files

Merge "Restrict the framework manifest check against frozen files" am: ee4bc816 

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



Change-Id: Ib8cc13296120c5aed25552982c7aa9fe8d5a0d4e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents f2044b0a ee4bc816

core/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -4607,7 +4607,10 @@ $(check_vintf_system_log): $(HOST_OUT_EXECUTABLES)/checkvintf $(check_vintf_syst 
$(call declare-0p-target,$(check_vintf_system_log))

check_vintf_system_log :=



# -- Check framework manifest against frozen manifests for GSI targets. They need to be compatible.

ifneq (true, $(BUILDING_VENDOR_IMAGE))

    vintffm_log := $(intermediates)/vintffm.log

endif

check_vintf_all_deps += $(vintffm_log)

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

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