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

Commit 1bf5cd31 authored by Yifan Hong's avatar Yifan Hong
Browse files

Add product manifest. 

- Rename framework_manifest.xml to system_manifest.xml since that's more accurate.
- Add product_manifest.xml to base_product.mk
- Add product_manifest.xml to verified_assembled_framework_manifest.xml to check
  it at build time.

Bug: 126770403
Bug: 130714844
Bug: 80547152

Test: build and inspect output
Test: lshal

Change-Id: I1b447d8c36f72768e28e9bcaa4d06afdeba08c2a
Merged-In: I1b447d8c36f72768e28e9bcaa4d06afdeba08c2a
parent 764d48ec

core/Makefile

+27 −22
Original line number Diff line number Diff line
@@ -2117,25 +2117,6 @@ endif 


FULL_SYSTEMIMAGE_DEPS += $(INTERNAL_ROOT_FILES) $(INSTALLED_FILES_FILE_ROOT)



# -----------------------------------------------------------------

# 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 $@



# -----------------------------------------------------------------

ifdef BUILDING_SYSTEM_IMAGE
@@ -2316,7 +2297,6 @@ define build-systemimage-target 
           exit 1 )

endef



$(BUILT_SYSTEMIMAGE): $(BUILT_ASSEMBLED_SYSTEM_MANIFEST)

$(BUILT_SYSTEMIMAGE): $(FULL_SYSTEMIMAGE_DEPS) $(INSTALLED_FILES_FILE) $(BUILD_IMAGE_SRCS)

	$(call build-systemimage-target,$@)
@@ -2949,6 +2929,31 @@ INSTALLED_PRODUCTIMAGE_TARGET := $(PRODUCT_OUT)/product.img 
$(eval $(call copy-one-file,$(BOARD_PREBUILT_PRODUCTIMAGE),$(INSTALLED_PRODUCTIMAGE_TARGET)))

endif



# -----------------------------------------------------------------

# Final Framework 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_FRAMEWORK_MANIFEST := $(PRODUCT_OUT)/verified_assembled_framework_manifest.xml

$(BUILT_ASSEMBLED_FRAMEWORK_MANIFEST): $(HOST_OUT_EXECUTABLES)/assemble_vintf \

                                       $(BUILT_VENDOR_MATRIX) \

                                       $(BUILT_SYSTEM_MANIFEST) \

                                       $(FULL_SYSTEMIMAGE_DEPS) \

                                       $(BUILT_PRODUCT_MANIFEST) \

                                       $(BUILT_PRODUCTIMAGE_TARGET)

	@echo "Verifying framework VINTF manifest."

	PRODUCT_ENFORCE_VINTF_MANIFEST=$(PRODUCT_ENFORCE_VINTF_MANIFEST) \

	$(HOST_OUT_EXECUTABLES)/assemble_vintf \

	    -o $@ \

	    -c $(BUILT_VENDOR_MATRIX) \

	    -i $(BUILT_SYSTEM_MANIFEST) \

	    $(addprefix -i ,\

	      $(filter $(TARGET_OUT)/etc/vintf/manifest/%.xml,$(FULL_SYSTEMIMAGE_DEPS)) \

	      $(BUILT_PRODUCT_MANIFEST) \

	      $(filter $(TARGET_OUT_PRODUCT)/etc/vintf/manifest/%.xml,$(INTERNAL_PRODUCTIMAGE_FILES)))



droidcore: $(BUILT_ASSEMBLED_FRAMEWORK_MANIFEST)



# -----------------------------------------------------------------

# product_services partition image

ifdef BUILDING_PRODUCT_SERVICES_IMAGE
@@ -3831,7 +3836,7 @@ $(BUILT_TARGET_FILES_PACKAGE): \ 
	    $(HOST_OUT_EXECUTABLES)/bsdiff \

	    $(HOST_OUT_EXECUTABLES)/care_map_generator \

	    $(BUILD_IMAGE_SRCS) \

	    $(BUILT_ASSEMBLED_SYSTEM_MANIFEST) \

	    $(BUILT_ASSEMBLED_FRAMEWORK_MANIFEST) \

	    $(BUILT_ASSEMBLED_VENDOR_MANIFEST) \

	    $(BUILT_SYSTEM_MATRIX) \

	    $(BUILT_VENDOR_MATRIX) \
@@ -4175,7 +4180,7 @@ ifdef BUILDING_SYSTEM_OTHER_IMAGE 
endif

	@# Metadata for compatibility verification.

	$(hide) cp $(BUILT_SYSTEM_MATRIX) $(zip_root)/META/system_matrix.xml

	$(hide) cp $(BUILT_ASSEMBLED_SYSTEM_MANIFEST) $(zip_root)/META/system_manifest.xml

	$(hide) cp $(BUILT_ASSEMBLED_FRAMEWORK_MANIFEST) $(zip_root)/META/system_manifest.xml

ifdef BUILT_ASSEMBLED_VENDOR_MANIFEST

	$(hide) cp $(BUILT_ASSEMBLED_VENDOR_MANIFEST) $(zip_root)/META/vendor_manifest.xml

endif

target/product/base_product.mk

+1 −0
Original line number Diff line number Diff line
@@ -19,3 +19,4 @@ PRODUCT_PACKAGES += \ 
    healthd \

    ModuleMetadata \

    product_compatibility_matrix.xml \

    product_manifest.xml \

target/product/base_system.mk

+1 −1
Original line number Diff line number Diff line
@@ -272,7 +272,7 @@ PRODUCT_PACKAGES += \ 


# VINTF data for system image

PRODUCT_PACKAGES += \

    framework_manifest.xml \

    system_manifest.xml \

    system_compatibility_matrix.xml \



# Host tools to install