Add support for building on Android

Change-Id: I2b510f7f926848910af5282fdb16e33d21e87a4e

exfat: Rework build configuration

Change-Id: Ic13f30258a84593a601a3866ebb55cb4eb82f8a9

exfat: Silence warnings

Change-Id: I0a44bff2363eb3ba7427b33aa98b3f708dac6e06

exfat: Remove recursive dependency

 * Modules cannot depend on themselves.

Change-Id: I38e8d6f2151e8c20c38793453030c205f5ba5db6

7 files changed, 99 insertions, 2 deletions

diff --git a/Android.mk b/Android.mk
new file mode 100644
index 0000000..58210b5
--- /dev/null
+++ b/Android.mk
@@ -0,0 +1,6 @@
+FUSE_ROOT := $(call my-dir)
+
+include $(FUSE_ROOT)/libexfat/Android.mk
+include $(FUSE_ROOT)/fuse/Android.mk
+include $(FUSE_ROOT)/mkfs/Android.mk
+include $(FUSE_ROOT)/fsck/Android.mk
diff --git a/fsck/Android.mk b/fsck/Android.mk
new file mode 100644
index 0000000..85fb0eb
--- /dev/null
+++ b/fsck/Android.mk
@@ -0,0 +1,23 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := fsck.exfat
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64
+LOCAL_SRC_FILES = main.c
+LOCAL_C_INCLUDES += $(LOCAL_PATH) \
+	external/exfat/libexfat \
+	external/fuse/include
+LOCAL_SHARED_LIBRARIES := libexfat
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libexfat_fsck_static
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -Dmain=fsck_exfat_main
+LOCAL_SRC_FILES = main.c
+LOCAL_C_INCLUDES += $(LOCAL_PATH) \
+	external/exfat/libexfat \
+	external/fuse/include
+LOCAL_STATIC_LIBRARIES := libfuse_static libexfat_static
+include $(BUILD_STATIC_LIBRARY)
diff --git a/fuse/Android.mk b/fuse/Android.mk
new file mode 100644
index 0000000..32a96fb
--- /dev/null
+++ b/fuse/Android.mk
@@ -0,0 +1,25 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := mount.exfat
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wno-unused-parameter
+LOCAL_SRC_FILES = main.c
+LOCAL_C_INCLUDES += $(LOCAL_PATH) \
+	external/exfat/libexfat \
+	external/fuse/include \
+	external/fuse/android
+LOCAL_SHARED_LIBRARIES := libexfat libfuse
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libexfat_mount_static
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -Dmain=mount_exfat_main -Wno-unused-parameter
+LOCAL_SRC_FILES = main.c
+LOCAL_C_INCLUDES += $(LOCAL_PATH) \
+	external/exfat/libexfat \
+	external/fuse/include \
+	external/fuse/android
+LOCAL_STATIC_LIBRARIES := libfuse_static libexfat_static
+include $(BUILD_STATIC_LIBRARY)
diff --git a/libexfat/Android.mk b/libexfat/Android.mk
new file mode 100644
index 0000000..8058bc1
--- /dev/null
+++ b/libexfat/Android.mk
@@ -0,0 +1,20 @@
+LOCAL_PATH := $(call my-dir)
+
+common_src_files = cluster.c io.c log.c lookup.c mount.c node.c time.c utf.c utils.c
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libexfat
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wno-sign-compare -Wno-unused-parameter
+LOCAL_SRC_FILES = $(common_src_files)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)
+include $(BUILD_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libexfat_static
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wno-sign-compare -Wno-unused-parameter
+LOCAL_SRC_FILES = $(common_src_files)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)
+LOCAL_STATIC_LIBRARIES := libfuse_static
+include $(BUILD_STATIC_LIBRARY)
diff --git a/libexfat/compiler.h b/libexfat/compiler.h
index e4f40de..babdbfa 100644
--- a/libexfat/compiler.h
+++ b/libexfat/compiler.h
@@ -24,7 +24,7 @@
 #ifndef COMPILER_H_INCLUDED
 #define COMPILER_H_INCLUDED
 
-#if __STDC_VERSION__ < 199901L
+#if defined(__STDC_VERSION__) && (__STDC_VERSION__ < 199901L)
 #error C99-compliant compiler is required
 #endif
 
diff --git a/libexfat/platform.h b/libexfat/platform.h
index b3505f4..2fe5341 100644
--- a/libexfat/platform.h
+++ b/libexfat/platform.h
@@ -46,7 +46,7 @@
 #define EXFAT_LITTLE_ENDIAN LITTLE_ENDIAN
 #define EXFAT_BIG_ENDIAN BIG_ENDIAN
 
-#elif defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
+#elif defined(__ANDROID__) || defined(__FreeBSD__) || defined(__DragonFlyBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
 
 #include <sys/endian.h>
 #define exfat_bswap16(x) bswap16(x)
diff --git a/mkfs/Android.mk b/mkfs/Android.mk
new file mode 100644
index 0000000..f9932eb
--- /dev/null
+++ b/mkfs/Android.mk
@@ -0,0 +1,23 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := mkfs.exfat
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -Wno-sign-compare -Wno-unused-parameter
+LOCAL_SRC_FILES = cbm.c fat.c main.c mkexfat.c rootdir.c uct.c uctc.c vbr.c
+LOCAL_C_INCLUDES += $(LOCAL_PATH) \
+	external/exfat/libexfat \
+	external/fuse/include
+LOCAL_SHARED_LIBRARIES := libfuse libexfat
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libexfat_mkfs_static
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -Dmain=mkfs_exfat_main -Wno-sign-compare -Wno-unused-parameter
+LOCAL_SRC_FILES = cbm.c fat.c main.c mkexfat.c rootdir.c uct.c uctc.c vbr.c
+LOCAL_C_INCLUDES += $(LOCAL_PATH) \
+	external/exfat/libexfat \
+	external/fuse/include
+LOCAL_STATIC_LIBRARIES := libfuse_static libexfat_static
+include $(BUILD_STATIC_LIBRARY)