Support manifest fragments.
LOCAL_VINTF_FRAGMENTS/vintf_fragments are
used to specify what manifest fragments should be installed
by a target.
Test: fragments get installed to the right location
Test: broken fragment gets detected
Test: boot device and verify service is working and manifest is updated
Test: verify OTA package contains fragments
Bug: 66917623
Change-Id: I21abe65a31b8c3d255c8ccd80e102ff3acb23105
diff --git a/core/Makefile b/core/Makefile
index 8c88d0a..9a76188 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -2538,6 +2538,7 @@
$(HOST_OUT_EXECUTABLES)/imgdiff \
$(HOST_OUT_EXECUTABLES)/bsdiff \
$(BUILD_IMAGE_SRCS) \
+ $(HOST_OUT_EXECUTABLES)/assemble_vintf \
$(BUILT_VENDOR_MANIFEST) \
$(BUILT_VENDOR_MATRIX) \
| $(ACP)
@@ -2825,10 +2826,16 @@
$(hide) $(call fs_config,$(zip_root)/SYSTEM_OTHER,system/) > $(zip_root)/META/system_other_filesystem_config.txt
endif
@# Metadata for compatibility verification.
- $(hide) cp $(BUILT_SYSTEM_MANIFEST) $(zip_root)/META/system_manifest.xml
$(hide) cp $(BUILT_SYSTEM_COMPATIBILITY_MATRIX) $(zip_root)/META/system_matrix.xml
+ $(hide) $(HOST_OUT_EXECUTABLES)/assemble_vintf \
+ -i $(BUILT_SYSTEM_MANIFEST) $$(find $(zip_root)/SYSTEM/etc/vintf/manifest -type f -name "*.xml" | \
+ sed "s/^/-i /" | tr '\n' ' ') \
+ -o $(zip_root)/META/system_manifest.xml
ifdef BUILT_VENDOR_MANIFEST
- $(hide) cp $(BUILT_VENDOR_MANIFEST) $(zip_root)/META/vendor_manifest.xml
+ $(hide) $(HOST_OUT_EXECUTABLES)/assemble_vintf \
+ -i $(BUILT_VENDOR_MANIFEST) $$(find $(zip_root)/VENDOR/etc/vintf/manifest -type f -name "*.xml" | \
+ sed "s/^/-i /" | tr '\n' ' ') \
+ -o $(zip_root)/META/vendor_manifest.xml
endif
ifdef BUILT_VENDOR_MATRIX
$(hide) cp $(BUILT_VENDOR_MATRIX) $(zip_root)/META/vendor_matrix.xml