Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3010668a authored by Tom Marshall's avatar Tom Marshall
Browse files

recovery: fstools: Honor TARGET_USES_EXFAT 

Change-Id: I0e02ce2501cea8e7620fc3afe2d996ab98d32f60
parent bb67c56c

fstools/Android.mk

+11 −7
Original line number Diff line number Diff line
@@ -13,12 +13,6 @@ LOCAL_FORCE_STATIC_EXECUTABLE := true 
LOCAL_WHOLE_STATIC_LIBRARIES += \

	libfuse_static



LOCAL_WHOLE_STATIC_LIBRARIES += \

	libexfat_static \

	libexfat_fsck_static \

	libexfat_mkfs_static \

	libexfat_mount_static 



LOCAL_WHOLE_STATIC_LIBRARIES += \

	libntfs-3g_static \

	libntfs3g_fsck_static \
@@ -52,10 +46,20 @@ LOCAL_STATIC_LIBRARIES := \ 


FSTOOLS_LINKS := \

	e2fsck mke2fs tune2fs fsck.ext4 mkfs.ext4 \

	fsck.exfat mkfs.exfat mount.exfat \

	fsck.ntfs mkfs.ntfs mount.ntfs \

	mkfs.f2fs fsck.f2fs



ifeq ($(TARGET_USES_EXFAT),true)

LOCAL_CFLAGS += -DHAVE_EXFAT

LOCAL_WHOLE_STATIC_LIBRARIES += \

	libexfat_static \

	libexfat_fsck_static \

	libexfat_mkfs_static \

	libexfat_mount_static

FSTOOLS_LINKS += \

	fsck.exfat mkfs.exfat mount.exfat

endif



FSTOOLS_LINKS += \

	sgdisk

fstools/fstools.h

+4 −0
Original line number Diff line number Diff line
@@ -24,9 +24,11 @@ int e2fsck_main(int argc, char **argv); 
int mke2fs_main(int argc, char **argv);

int tune2fs_main(int argc, char **argv);



#ifdef HAVE_EXFAT

int fsck_exfat_main(int argc, char **argv);

int mkfs_exfat_main(int argc, char **argv);

int mount_exfat_main(int argc, char **argv);

#endif



int fsck_ntfs3g_main(int argc, char **argv);

int mkfs_ntfs3g_main(int argc, char **argv);
@@ -49,9 +51,11 @@ static const struct fstools_cmd fstools_cmds[] = { 
    { "tune2fs",        tune2fs_main },

    { "fsck.ext4",      e2fsck_main },

    { "mkfs.ext4",      mke2fs_main },

#ifdef HAVE_EXFAT

    { "fsck.exfat",     fsck_exfat_main },

    { "mkfs.exfat",     mkfs_exfat_main },

    { "mount.exfat",    mount_exfat_main },

#endif

    { "fsck.ntfs",      fsck_ntfs3g_main },

    { "mkfs.ntfs",      mkfs_ntfs3g_main },

    { "mount.ntfs",     mount_ntfs3g_main },