From 34741d9cefd5981d23330eb6f6130d7d30ddf206 Mon Sep 17 00:00:00 2001 From: Ethan Yonker Date: Sat, 6 Feb 2016 13:22:45 -0600 Subject: Fix no exfat-fuse rules If we set TW_NO_EXFAT then we should not try to build exfat-fuse Change-Id: I836ed6082cfbfb51bfb862b79c0182f36de88a9c --- Android.mk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'Android.mk') diff --git a/Android.mk b/Android.mk index 0660a46dc..0fb934d1a 100644 --- a/Android.mk +++ b/Android.mk @@ -379,6 +379,9 @@ else endif ifneq ($(TW_NO_EXFAT), true) LOCAL_ADDITIONAL_DEPENDENCIES += mkexfatfs fsckexfat + ifneq ($(TW_NO_EXFAT_FUSE), true) + LOCAL_ADDITIONAL_DEPENDENCIES += exfat-fuse + endif endif ifeq ($(BOARD_HAS_NO_REAL_SDCARD),) ifeq ($(shell test $(PLATFORM_SDK_VERSION) -gt 22; echo $$?),0) @@ -407,9 +410,6 @@ ifneq ($(TW_EXCLUDE_SUPERSU), true) libsupol.soarm64 suarm64 supolicyarm64 endif endif -ifneq ($(TW_NO_EXFAT_FUSE), true) - LOCAL_ADDITIONAL_DEPENDENCIES += exfat-fuse -endif ifeq ($(TW_INCLUDE_FB2PNG), true) LOCAL_ADDITIONAL_DEPENDENCIES += fb2png endif @@ -610,9 +610,9 @@ ifneq ($(TW_NO_EXFAT), true) $(commands_recovery_local_path)/exfat/fsck/Android.mk \ $(commands_recovery_local_path)/fuse/Android.mk \ $(commands_recovery_local_path)/exfat/libexfat/Android.mk -endif -ifneq ($(TW_NO_EXFAT_FUSE), true) - include $(commands_recovery_local_path)/exfat/fuse/Android.mk + ifneq ($(TW_NO_EXFAT_FUSE), true) + include $(commands_recovery_local_path)/exfat/fuse/Android.mk + endif endif ifneq ($(TW_OEM_BUILD),true) include $(commands_recovery_local_path)/orscmd/Android.mk -- cgit v1.2.3