commit ee4bc816c3221a85bf8f5f909ea891afaf074d53
author Devin Moore <devinmoore@google.com> Tue Oct 18 15:22:32 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 18 15:22:32 2022 +0000
tree 98e3615f5bdcbc18ba9f4d7f2641332f94098529
parent 163ece5b559ad41aaeb57eb32d6253ebfe564b1d
parent 62d0a739bbce94f3f3721e036ca9b2df94e18ba1

Merge "Restrict the framework manifest check against frozen files"

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index f18dcd4..317b690 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4607,7 +4607,10 @@
 $(call declare-0p-target,$(check_vintf_system_log))
 check_vintf_system_log :=
 
-vintffm_log := $(intermediates)/vintffm.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) \