commit 078bfdfeb42a135e23efea64f45e452340a210e5
author Devin Moore <devinmoore@google.com> Thu Jun 01 17:54:03 2023 +0000
committer Devin Moore <devinmoore@google.com> Mon Jun 26 18:01:03 2023 +0000
tree 04067d5b12bc40d51b062a4d02d85a065b532d75
parent a3b0027fdbc4d623f5ea4f881fa0eae64ddc6d32

Pass system_ext and product dirs to libvintf

Now that we have manifest fragements in system_ext, we need to tell
libvintf about them.

Test: lunch aosp_bramble-userdebug && m
Bug: 218588089
Change-Id: Iae56d3b8c790fa1d12321f8c3446a04a0ea816d5

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index 6dbbef1..848f41c 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -4893,6 +4893,8 @@
 check_vintf_all_deps += $(vintffm_log)
 $(vintffm_log): $(HOST_OUT_EXECUTABLES)/vintffm $(check_vintf_system_deps)
 	@( $< --check --dirmap /system:$(TARGET_OUT) \
+	  --dirmap /system_ext:$(TARGET_OUT_SYSTEM_EXT) \
+	  --dirmap /product:$(TARGET_OUT_PRODUCT) \
 	  $(VINTF_FRAMEWORK_MANIFEST_FROZEN_DIR) > $@ 2>&1 ) || ( cat $@ && exit 1 )
 
 $(call declare-1p-target,$(vintffm_log))