e2fsprogs: Rework build configuration

[android-x86/external-e2fsprogs.git] / e2fsck / Android.mk

diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk
index ed7d94d..e553cc5 100644 (file)
--- a/e2fsck/Android.mk
+++ b/e2fsck/Android.mk
@@ -38,7 +38,8 @@ libext2_profile_cflags := -O2 -g -W -Wall \
        -DHAVE_TYPE_SSIZE_T \
        -DHAVE_SYS_TIME_H \
         -DHAVE_SYS_PARAM_H \
-       -DHAVE_SYSCONF
+       -DHAVE_SYSCONF \
+       -DDISABLE_BACKTRACE=1
 
 include $(CLEAR_VARS)
 
@@ -47,7 +48,6 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_profile_system_shared_libraries)
 LOCAL_SHARED_LIBRARIES := $(libext2_profile_shared_libraries)
 LOCAL_C_INCLUDES := $(libext2_profile_c_includes)
 LOCAL_CFLAGS := $(libext2_profile_cflags)
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_profile
 LOCAL_MODULE_TAGS := optional
 
@@ -56,6 +56,18 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2_profile_src_files)
+LOCAL_STATIC_LIBRARIES := $(libext2_profile_system_shared_libraries) $(libext2_profile_shared_libraries)
+LOCAL_C_INCLUDES := $(libext2_profile_c_includes)
+LOCAL_CFLAGS := $(libext2_profile_cflags)
+LOCAL_PRELINK_MODULE := false
+LOCAL_MODULE := libext2_profile
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(libext2_profile_src_files)
 LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_profile_shared_libraries))
 LOCAL_C_INCLUDES := $(libext2_profile_c_includes)
 LOCAL_CFLAGS := $(libext2_profile_cflags)
@@ -78,6 +90,7 @@ e2fsck_src_files :=  \
        pass3.c \
        pass4.c \
        pass5.c \
+       logfile.c \
        journal.c \
        recovery.c \
        revoke.c \
@@ -90,21 +103,24 @@ e2fsck_src_files :=  \
        problem.c \
        message.c \
        ea_refcount.c \
+       quota.c \
        rehash.c \
-       region.c
+       region.c \
+       sigcatcher.c
 
 e2fsck_shared_libraries := \
        libext2fs \
        libext2_blkid \
        libext2_uuid \
        libext2_profile \
+       libext2_quota \
        libext2_com_err \
        libext2_e2p
 e2fsck_system_shared_libraries := libc
 
 e2fsck_c_includes := external/e2fsprogs/lib
 
-e2fsck_cflags := -O2 -g -W -Wall \
+e2fsck_cflags := -O2 -g -W -Wall -fno-strict-aliasing \
        -DHAVE_DIRENT_H \
        -DHAVE_ERRNO_H \
        -DHAVE_INTTYPES_H \
@@ -133,7 +149,8 @@ e2fsck_cflags := -O2 -g -W -Wall \
        -DENABLE_HTREE=1 \
        -DHAVE_SYS_TIME_H \
         -DHAVE_SYS_PARAM_H \
-       -DHAVE_SYSCONF
+       -DHAVE_SYSCONF \
+       -DDISABLE_BACKTRACE=1
 
 include $(CLEAR_VARS)
 
@@ -150,6 +167,32 @@ include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(e2fsck_src_files)
 LOCAL_C_INCLUDES := $(e2fsck_c_includes)
+LOCAL_CFLAGS := $(e2fsck_cflags) -Dmain=e2fsck_main
+LOCAL_STATIC_LIBRARIES := $(e2fsck_system_shared_libraries) $(e2fsck_shared_libraries) libext2fs
+LOCAL_MODULE := libe2fsck_static
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(e2fsck_src_files)
+LOCAL_C_INCLUDES := $(e2fsck_c_includes)
+LOCAL_CFLAGS := $(e2fsck_cflags)
+LOCAL_STATIC_LIBRARIES := $(e2fsck_system_shared_libraries) $(e2fsck_shared_libraries) libext2fs
+LOCAL_MODULE := utility_e2fsck
+LOCAL_MODULE_CLASS := UTILITY_EXECUTABLES
+LOCAL_MODULE_PATH := $(PRODUCT_OUT)/utilities
+LOCAL_UNSTRIPPED_PATH := $(PRODUCT_OUT)/symbols/utilities
+LOCAL_MODULE_STEM := e2fsck
+LOCAL_FORCE_STATIC_EXECUTABLE := true
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACK_MODULE_RELOCATIONS := false
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(e2fsck_src_files)
+LOCAL_C_INCLUDES := $(e2fsck_c_includes)
 LOCAL_CFLAGS := $(e2fsck_cflags)
 LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(e2fsck_shared_libraries))
 LOCAL_MODULE := e2fsck_host