Merge changes from topic "vintf_fragment" (de511491) · Commits · e / os / android_build

core/Makefile

+56 −12

Original line number	Original line	Diff line number	Diff line
	@@ -1493,6 +1493,25 @@ ifneq (,$(SANITIZE_TARGET))
	endif		endif
	endif		endif

			# -----------------------------------------------------------------
			# Final System VINTF manifest including fragments. This is not assembled
			# on the device because it depends on everything in a given device
			# image which defines a vintf_fragment.

			BUILT_ASSEMBLED_SYSTEM_MANIFEST := $(PRODUCT_OUT)/verified_assembled_system_manifest.xml
			$(BUILT_ASSEMBLED_SYSTEM_MANIFEST): $(HOST_OUT_EXECUTABLES)/assemble_vintf
			$(BUILT_ASSEMBLED_SYSTEM_MANIFEST): $(BUILT_VENDOR_MATRIX)
			$(BUILT_ASSEMBLED_SYSTEM_MANIFEST): $(BUILT_SYSTEM_MANIFEST)
			$(BUILT_ASSEMBLED_SYSTEM_MANIFEST): $(FULL_SYSTEMIMAGE_DEPS)
			@echo "Verifying system VINTF manifest."
			PRODUCT_ENFORCE_VINTF_MANIFEST=$(PRODUCT_ENFORCE_VINTF_MANIFEST) \
			$(HOST_OUT_EXECUTABLES)/assemble_vintf \
			-c $(BUILT_VENDOR_MATRIX) \
			-i $(BUILT_SYSTEM_MANIFEST) \
			$$([ -d $(TARGET_OUT)/etc/vintf/manifest ] && \
			find $(TARGET_OUT)/etc/vintf/manifest -type f -name "*.xml" \| \
			sed "s/^/-i /" \| tr '\n' ' ') -o $@

	# -----------------------------------------------------------------		# -----------------------------------------------------------------
	# installed file list		# installed file list
	# Depending on anything that $(BUILT_SYSTEMIMAGE) depends on.		# Depending on anything that $(BUILT_SYSTEMIMAGE) depends on.
	@@ -1569,6 +1588,7 @@ define build-systemimage-target
	exit 1 )		exit 1 )
	endef		endef

			$(BUILT_SYSTEMIMAGE): $(BUILT_ASSEMBLED_SYSTEM_MANIFEST)
	$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(BUILD_IMAGE_SRCS)		$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(BUILD_IMAGE_SRCS)
	$(call build-systemimage-target,$@)		$(call build-systemimage-target,$@)

	@@ -1983,6 +2003,32 @@ INTERNAL_VENDORIMAGE_FILES := \
	$(ALL_PDK_FUSION_FILES)) \		$(ALL_PDK_FUSION_FILES)) \
	$(PDK_FUSION_SYMLINK_STAMP)		$(PDK_FUSION_SYMLINK_STAMP)

			# Final Vendor VINTF manifest including fragments. This is not assembled
			# on the device because it depends on everything in a given device
			# image which defines a vintf_fragment.
			ifdef BUILT_VENDOR_MANIFEST
			BUILT_ASSEMBLED_VENDOR_MANIFEST := $(PRODUCT_OUT)/verified_assembled_vendor_manifest.xml
			ifeq (true,$(strip $(PRODUCT_ENFORCE_VINTF_MANIFEST)))
			ifdef DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE
			# TODO(b/65028233): turn this on globally
			$(BUILT_ASSEMBLED_VENDOR_MANIFEST): PRIVATE_SYSTEM_ASSEMBLE_VINTF_ENV_VARS := VINTF_ENFORCE_NO_UNUSED_HALS=true
			endif # DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE
			endif # PRODUCT_ENFORCE_VINTF_MANIFEST
			$(BUILT_ASSEMBLED_VENDOR_MANIFEST): $(HOST_OUT_EXECUTABLES)/assemble_vintf
			$(BUILT_ASSEMBLED_VENDOR_MANIFEST): $(BUILT_SYSTEM_MATRIX)
			$(BUILT_ASSEMBLED_VENDOR_MANIFEST): $(BUILT_VENDOR_MANIFEST)
			$(BUILT_ASSEMBLED_VENDOR_MANIFEST): $(INTERNAL_VENDORIMAGE_FILES)
			@echo "Verifying vendor VINTF manifest."
			PRODUCT_ENFORCE_VINTF_MANIFEST=$(PRODUCT_ENFORCE_VINTF_MANIFEST) \
			$(PRIVATE_SYSTEM_ASSEMBLE_VINTF_ENV_VARS) \
			$(HOST_OUT_EXECUTABLES)/assemble_vintf \
			-c $(BUILT_SYSTEM_MATRIX) \
			-i $(BUILT_VENDOR_MANIFEST) \
			$$([ -d $(TARGET_OUT_VENDOR)/etc/vintf/manifest ] && \
			find $(TARGET_OUT_VENDOR)/etc/vintf/manifest -type f -name "*.xml" \| \
			sed "s/^/-i /" \| tr '\n' ' ') -o $@
			endif # BUILT_VENDOR_MANIFEST

	# platform.zip depends on $(INTERNAL_VENDORIMAGE_FILES).		# platform.zip depends on $(INTERNAL_VENDORIMAGE_FILES).
	$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_VENDORIMAGE_FILES)		$(INSTALLED_PLATFORM_ZIP) : $(INTERNAL_VENDORIMAGE_FILES)

	@@ -2012,6 +2058,9 @@ endef

	# We just build this directly to the install location.		# We just build this directly to the install location.
	INSTALLED_VENDORIMAGE_TARGET := $(BUILT_VENDORIMAGE_TARGET)		INSTALLED_VENDORIMAGE_TARGET := $(BUILT_VENDORIMAGE_TARGET)
			ifdef BUILT_VENDOR_MANIFEST
			$(INSTALLED_VENDORIMAGE_TARGET): $(BUILT_ASSEMBLED_VENDOR_MANIFEST)
			endif
	$(INSTALLED_VENDORIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDORIMAGE_FILES) $(INSTALLED_FILES_FILE_VENDOR) $(BUILD_IMAGE_SRCS) $(DEPMOD) $(BOARD_VENDOR_KERNEL_MODULES)		$(INSTALLED_VENDORIMAGE_TARGET): $(INTERNAL_USERIMAGES_DEPS) $(INTERNAL_VENDORIMAGE_FILES) $(INSTALLED_FILES_FILE_VENDOR) $(BUILD_IMAGE_SRCS) $(DEPMOD) $(BOARD_VENDOR_KERNEL_MODULES)
	$(build-vendorimage-target)		$(build-vendorimage-target)

	@@ -2542,8 +2591,9 @@ $(BUILT_TARGET_FILES_PACKAGE): \
	$(HOST_OUT_EXECUTABLES)/imgdiff \		$(HOST_OUT_EXECUTABLES)/imgdiff \
	$(HOST_OUT_EXECUTABLES)/bsdiff \		$(HOST_OUT_EXECUTABLES)/bsdiff \
	$(BUILD_IMAGE_SRCS) \		$(BUILD_IMAGE_SRCS) \
	$(HOST_OUT_EXECUTABLES)/assemble_vintf \		$(BUILT_ASSEMBLED_SYSTEM_MANIFEST) \
	$(BUILT_VENDOR_MANIFEST) \		$(BUILT_ASSEMBLED_VENDOR_MANIFEST) \
			$(BUILT_SYSTEM_MATRIX) \
	$(BUILT_VENDOR_MATRIX) \		$(BUILT_VENDOR_MATRIX) \
	\| $(ACP)		\| $(ACP)
	@echo "Package target files: $@"		@echo "Package target files: $@"
	@@ -2819,16 +2869,10 @@ ifdef INSTALLED_SYSTEMOTHERIMAGE_TARGET
	$(hide) $(call fs_config,$(zip_root)/SYSTEM_OTHER,system/) > $(zip_root)/META/system_other_filesystem_config.txt		$(hide) $(call fs_config,$(zip_root)/SYSTEM_OTHER,system/) > $(zip_root)/META/system_other_filesystem_config.txt
	endif		endif
	@# Metadata for compatibility verification.		@# Metadata for compatibility verification.
	$(hide) cp $(BUILT_SYSTEM_COMPATIBILITY_MATRIX) $(zip_root)/META/system_matrix.xml		$(hide) cp $(BUILT_SYSTEM_MATRIX) $(zip_root)/META/system_matrix.xml
	$(hide) $(HOST_OUT_EXECUTABLES)/assemble_vintf \		$(hide) cp $(BUILT_ASSEMBLED_SYSTEM_MANIFEST) $(zip_root)/META/system_manifest.xml
	-i $(BUILT_SYSTEM_MANIFEST) $$(find $(zip_root)/SYSTEM/etc/vintf/manifest -type f -name "*.xml" \| \		ifdef BUILT_ASSEMBLED_VENDOR_MANIFEST
	sed "s/^/-i /" \| tr '\n' ' ') \		$(hide) cp $(BUILT_ASSEMBLED_VENDOR_MANIFEST) $(zip_root)/META/vendor_manifest.xml
	-o $(zip_root)/META/system_manifest.xml
	ifdef BUILT_VENDOR_MANIFEST
	$(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		endif
	ifdef BUILT_VENDOR_MATRIX		ifdef BUILT_VENDOR_MATRIX
	$(hide) cp $(BUILT_VENDOR_MATRIX) $(zip_root)/META/vendor_matrix.xml		$(hide) cp $(BUILT_VENDOR_MATRIX) $(zip_root)/META/vendor_matrix.xml