am 9ff8a716: am f35ed6bd: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev
* commit '9ff8a7162b1c6f8d10768537a8e3f45601d8d6da':
Allow flashing a squashfs system image
diff --git a/core/Makefile b/core/Makefile
index 1ff5ee2..d73f45e 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -713,6 +713,10 @@
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))