From 201727911f57e80923d91a2f340e6851103dcf84 Mon Sep 17 00:00:00 2001
From: Matt Mower <mowerm@gmail.com>
Date: Fri, 14 Nov 2014 10:54:03 -0600
Subject: Fix mkexfatfs exclusion when TW_NO_EXFAT enabled

Push to android-5.0

Conflicts:
	Android.mk

Change-Id: I0b831a4e6e52e4b314751035b750e6a398cb4d2d
---
 Android.mk | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Android.mk b/Android.mk
index 207ee16d9..e10fef108 100644
--- a/Android.mk
+++ b/Android.mk
@@ -313,7 +313,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := \
     flash_image \
     fix_permissions.sh \
     mke2fs.conf \
-    mkexfatfs \
     pigz \
     teamwin \
     toolbox_symlinks \
@@ -333,6 +332,9 @@ endif
 ifneq ($(TW_USE_TOOLBOX), true)
     LOCAL_ADDITIONAL_DEPENDENCIES += busybox_symlinks
 endif
+ifneq ($(TW_NO_EXFAT), true)
+    LOCAL_ADDITIONAL_DEPENDENCIES += mkexfatfs
+endif
 ifeq ($(BOARD_HAS_NO_REAL_SDCARD),)
     LOCAL_ADDITIONAL_DEPENDENCIES += parted
 endif
-- 
cgit v1.2.3