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

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

resolved conflicts for merge of 1a4658cd to mnc-dev

parents 4f177cc6 1a4658cd

core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -714,7 +714,7 @@ INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) $(IMG2SIMG) 
endif



ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs)

INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG)

INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) $(IMG2SIMG)

endif



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