diff options
| author | Tom Marshall <tdm@cyngn.com> | 2015-12-14 12:02:21 -0800 |
|---|---|---|
| committer | Tom Marshall <tdm@cyngn.com> | 2015-12-16 15:51:46 -0800 |
| commit | 3010668acc5282de04be11541dab88eaa56683e6 (patch) | |
| tree | 9f91f06e667c52d6c5a280abae19372ba288e64e | |
| parent | bb67c56c8093ab6c0369b9b0805fba3ee5ba960d (diff) | |
| download | bootable_recovery-3010668acc5282de04be11541dab88eaa56683e6.zip bootable_recovery-3010668acc5282de04be11541dab88eaa56683e6.tar.gz bootable_recovery-3010668acc5282de04be11541dab88eaa56683e6.tar.bz2 | |
recovery: fstools: Honor TARGET_USES_EXFAT
Change-Id: I0e02ce2501cea8e7620fc3afe2d996ab98d32f60
| -rw-r--r-- | fstools/Android.mk | 18 | ||||
| -rw-r--r-- | fstools/fstools.h | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/fstools/Android.mk b/fstools/Android.mk index 5dc060b..73dc0f0 100644 --- a/fstools/Android.mk +++ b/fstools/Android.mk @@ -14,12 +14,6 @@ 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 \ libntfs3g_mkfs_main \ @@ -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 diff --git a/fstools/fstools.h b/fstools/fstools.h index 97fcfde..d99b382 100644 --- a/fstools/fstools.h +++ b/fstools/fstools.h @@ -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 }, |