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

Commit c8a55698 authored by Steven Moreland's avatar Steven Moreland Committed by android-build-merger
Browse files

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

am: 79a55b31

Change-Id: I54d681b2112ebc9b52784a5da3b15eed52a2f2de
parents 37976b77 79a55b31

core/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -2607,8 +2607,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
@@ -2617,7 +2615,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) \