From: Mohamad Ayyash <mkayyash@google.com>
Date: Tue, 23 Jun 2015 23:22:32 +0000 (-0700)
Subject: resolved conflicts for merge of cade49dd to lmp-mr1-ub-dev
X-Git-Tag: android-x86-6.0-r1~144^2~11
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f35ed6bd;p=android-x86%2Fbuild.git

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

f35ed6bd8497633c057030e5442cd0fc29b37b6c
diff --cc core/Makefile
index 9a432da1b,90943036d..8ff1111a5
--- a/core/Makefile
+++ b/core/Makefile
@@@ -679,12 -697,14 +679,16 @@@ INTERNAL_USERIMAGES_DEPS += $(MKEXTUSER
  ifeq ($(TARGET_USERIMAGES_USE_F2FS),true)
  INTERNAL_USERIMAGES_DEPS += $(MKF2FSUSERIMG) $(MAKE_F2FS)
  endif
 -else
 -INTERNAL_USERIMAGES_DEPS := $(MKYAFFS2)
 +endif
 +
 +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))