exfat: Rework build configuration

Change-Id: Ic13f30258a84593a601a3866ebb55cb4eb82f8a9

diff --git a/Android.mk b/Android.mk
index 5053e7d..58210b5 100644 (file)
--- a/Android.mk
+++ b/Android.mk
@@ -1 +1,6 @@
-include $(call all-subdir-makefiles)
+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
index 145384a..ffcc0bf 100644 (file)
--- a/fsck/Android.mk
+++ b/fsck/Android.mk
@@ -1,7 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)

-

 LOCAL_MODULE := fsck.exfat
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64
 LOCAL_MODULE := fsck.exfat
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64


@@ -9,8 +8,17 @@ LOCAL_SRC_FILES =  main.c
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
                                        external/exfat/libexfat \
                                        external/fuse/include
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
                                        external/exfat/libexfat \
                                        external/fuse/include

-LOCAL_SHARED_LIBRARIES += libz libc libexfat libdl 
-LOCAL_STATIC_LIBRARIES += libfuse
-
+LOCAL_SHARED_LIBRARIES := libexfat

 include $(BUILD_EXECUTABLE)
 
 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
index cf7688f..419f47f 100644 (file)
--- a/fuse/Android.mk
+++ b/fuse/Android.mk
@@ -5,11 +5,21 @@ LOCAL_MODULE := mount.exfat
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64
 LOCAL_SRC_FILES = main.c 
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64
 LOCAL_SRC_FILES = main.c 

+LOCAL_SHARED_LIBRARIES := libexfat libfuse

 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
                                        external/exfat/libexfat \
                                        external/fuse/include \
                                        external/fuse/android
 LOCAL_C_INCLUDES += $(LOCAL_PATH) \
                                        external/exfat/libexfat \
                                        external/fuse/include \
                                        external/fuse/android

-LOCAL_SHARED_LIBRARIES += libz libc libexfat libdl 
-LOCAL_STATIC_LIBRARIES += libfuse
-

 include $(BUILD_EXECUTABLE)
 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
+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
index 39a7faa..7bbeb46 100644 (file)
--- a/libexfat/Android.mk
+++ b/libexfat/Android.mk
@@ -1,12 +1,20 @@
 LOCAL_PATH := $(call my-dir)
 
 LOCAL_PATH := $(call my-dir)
 

-include $(CLEAR_VARS)
+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
 LOCAL_MODULE := libexfat
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64

-LOCAL_SRC_FILES = cluster.c io.c log.c lookup.c mount.c node.c time.c utf.c utils.c 
-LOCAL_C_INCLUDES += $(LOCAL_PATH) \
-LOCAL_SHARED_LIBRARIES += libc
-
+LOCAL_SRC_FILES = $(common_src_files)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)

 include $(BUILD_SHARED_LIBRARY)
 include $(BUILD_SHARED_LIBRARY)

+
+include $(CLEAR_VARS)
+LOCAL_MODULE := libexfat_static
+LOCAL_MODULE_TAGS := optional
+LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64
+LOCAL_SRC_FILES = $(common_src_files)
+LOCAL_C_INCLUDES += $(LOCAL_PATH)
+LOCAL_STATIC_LIBRARIES := libfuse_static libexfat_static
+include $(BUILD_STATIC_LIBRARY)

diff --git a/mkfs/Android.mk b/mkfs/Android.mk
index 4ca91bc..ebec1cc 100644 (file)
--- a/mkfs/Android.mk
+++ b/mkfs/Android.mk
@@ -1,7 +1,6 @@
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)

-

 LOCAL_MODULE := mkfs.exfat
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64
 LOCAL_MODULE := mkfs.exfat
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS = -D_FILE_OFFSET_BITS=64


@@ -9,7 +8,16 @@ 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_C_INCLUDES += $(LOCAL_PATH) \
                                        external/exfat/libexfat \
                                        external/fuse/include

-LOCAL_SHARED_LIBRARIES += libz libc libexfat libdl 
-LOCAL_STATIC_LIBRARIES += libfuse
-
+LOCAL_SHARED_LIBRARIES := libfuse libexfat

 include $(BUILD_EXECUTABLE)
 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
+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)