summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCaptain Throwback <captainthrowback@hotmail.com>2014-09-18 18:46:35 +0200
committerEthan Yonker <dees_troy@teamw.in>2014-10-07 20:48:25 +0200
commit6a1acf2ce4c522d51296b1cd1beced53b4da97df (patch)
tree0467e51d9c28346419ddb4be29ece3c5e24f5e87
parentrecovery: Fix adb with linux 3.10 (diff)
downloadandroid_bootable_recovery-6a1acf2ce4c522d51296b1cd1beced53b4da97df.tar
android_bootable_recovery-6a1acf2ce4c522d51296b1cd1beced53b4da97df.tar.gz
android_bootable_recovery-6a1acf2ce4c522d51296b1cd1beced53b4da97df.tar.bz2
android_bootable_recovery-6a1acf2ce4c522d51296b1cd1beced53b4da97df.tar.lz
android_bootable_recovery-6a1acf2ce4c522d51296b1cd1beced53b4da97df.tar.xz
android_bootable_recovery-6a1acf2ce4c522d51296b1cd1beced53b4da97df.tar.zst
android_bootable_recovery-6a1acf2ce4c522d51296b1cd1beced53b4da97df.zip
-rw-r--r--Android.mk6
-rw-r--r--prebuilt/Android.mk5
2 files changed, 8 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk
index 3d95c840c..10dc79fd7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -416,11 +416,13 @@ ifeq ($(BUILD_ID), GINGERBREAD)
TW_NO_EXFAT := true
endif
ifneq ($(TW_NO_EXFAT), true)
- include $(commands_recovery_local_path)/exfat/exfat-fuse/Android.mk \
- $(commands_recovery_local_path)/exfat/mkfs/Android.mk \
+ include $(commands_recovery_local_path)/exfat/mkfs/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/exfat-fuse/Android.mk
+endif
ifeq ($(TW_INCLUDE_CRYPTO), true)
include $(commands_recovery_local_path)/crypto/ics/Android.mk
endif
diff --git a/prebuilt/Android.mk b/prebuilt/Android.mk
index 9431c945e..dc97e9118 100644
--- a/prebuilt/Android.mk
+++ b/prebuilt/Android.mk
@@ -79,9 +79,12 @@ ifeq ($(BUILD_ID), GINGERBREAD)
TW_NO_EXFAT := true
endif
ifneq ($(TW_NO_EXFAT), true)
- RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/exfat-fuse
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/mkexfatfs
RELINK_SOURCE_FILES += $(TARGET_OUT_SHARED_LIBRARIES)/libexfat.so
+ TW_NO_EXFAT_FUSE := true
+endif
+ifneq ($(TW_NO_EXFAT_FUSE), true)
+ RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/exfat-fuse
endif
ifeq ($(TW_INCLUDE_BLOBPACK), true)
RELINK_SOURCE_FILES += $(TARGET_RECOVERY_ROOT_OUT)/sbin/blobpack