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

Commit f35ed6bd authored by Mohamad Ayyash's avatar Mohamad Ayyash
Browse files

resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev

parents 552de126 cade49dd

core/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -685,6 +685,10 @@ ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs) 
INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG)

endif



ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs)

INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG)

endif



INTERNAL_USERIMAGES_BINARY_PATHS := $(sort $(dir $(INTERNAL_USERIMAGES_DEPS)))



ifeq (true,$(PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_SUPPORTS_VERITY))