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

Commit 01f9cb7b authored by Mohamad Ayyash's avatar Mohamad Ayyash Committed by Android Git Automerger
Browse files

am 6f79df6c: resolved conflicts for merge of af094912 to mnc-dev-plus-aosp 

* commit '6f79df6c':
  Add img2simg in host and ota packages
parents 78dd8281 6f79df6c

core/Makefile

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

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))