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

Commit 9ff8a716 authored by Mohamad Ayyash's avatar Mohamad Ayyash Committed by Android Git Automerger
Browse files

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

* commit 'f35ed6bd':
  Allow flashing a squashfs system image
parents 7102f577 f35ed6bd

core/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -713,6 +713,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))