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

Commit 7858d310 authored by Michael Schwartz's avatar Michael Schwartz Committed by Android (Google) Code Review
Browse files

Merge "Include Treble metadata on Treble enabled devices" into oc-dev

parents 84cbb4e9 cb5b8d2d
Loading
Loading
Loading
Loading
+3 −0
Original line number Diff line number Diff line
@@ -2338,6 +2338,8 @@ endif
ifdef INSTALLED_SYSTEMOTHERIMAGE_TARGET
	$(hide) $(call fs_config,$(zip_root)/SYSTEM_OTHER,system/) > $(zip_root)/META/system_other_filesystem_config.txt
endif

ifeq ($(PRODUCT_FULL_TREBLE),true)
	@# 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_compatibility_matrix.xml
@@ -2346,6 +2348,7 @@ ifdef BUILT_VENDOR_MANIFEST
endif
ifdef BUILT_VENDOR_MATRIX
	$(hide) cp $(BUILT_VENDOR_MATRIX) $(zip_root)/META/vendor_matrix.xml
endif
endif

	$(hide) PATH=$(foreach p,$(INTERNAL_USERIMAGES_BINARY_PATHS),$(p):)$$PATH MKBOOTIMG=$(MKBOOTIMG) \