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

Commit 79a55b31 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Revert "Include Treble metadata on Treble enabled devices""

parents b8e08222 7a9b07f6

core/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -2598,8 +2598,6 @@ 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_matrix.xml
@@ -2608,7 +2606,6 @@ 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) \