commit 426ec55b413b77b70cf25ba04941f1b9157ed32f
author Patrick Tjin <pattjin@google.com> Tue Feb 09 14:12:47 2016 -0800
committer Patrick Tjin <pattjin@google.com> Tue Feb 09 14:12:47 2016 -0800
tree 26dc7968ed0e20a604484d8bae389ff949e00864
parent f9f0a6180c905fa24166ee2ae8ecda35df58dd37

Allow squashfs for vendor image only

Previously, the squashfs dependencies were included only if
the system image was squashfs.  Allow the vendor image trigger
the dependency.

Change-Id: I5b1c513e9c13d83efc3ca6a904f08a91d9cca85f

core/Makefile

diff --git a/core/Makefile b/core/Makefile
index bc37369..1ee6549 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -754,7 +754,7 @@
 ifneq (true,$(TARGET_USERIMAGES_SPARSE_SQUASHFS_DISABLED))
   INTERNAL_USERIMAGES_SPARSE_SQUASHFS_FLAG := -s
 endif
-ifeq ($(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs)
+ifneq ($(filter $(BOARD_VENDORIMAGE_FILE_SYSTEM_TYPE) $(BOARD_SYSTEMIMAGE_FILE_SYSTEM_TYPE),squashfs),)
 INTERNAL_USERIMAGES_DEPS += $(MAKE_SQUASHFS) $(MKSQUASHFSUSERIMG) $(IMG2SIMG)
 endif