tests: add j_recover_csum3_64bit

[tools/e2fsprogs.git] / misc / Android.mk

diff --git a/misc/Android.mk b/misc/Android.mk
index 2c436c7..d960737 100644 (file)
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -7,11 +7,9 @@ mke2fs_src_files := \
        util.c \
        mk_hugefiles.c \
        default_profile.c \
-       create_inode.c \
-       plausible.c
+       create_inode.c
 
 mke2fs_c_includes := \
-       external/e2fsprogs/lib \
        external/e2fsprogs/e2fsck
 
 mke2fs_cflags := -O2 -g -W -Wall
@@ -42,7 +40,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(mke2fs_src_files)
 LOCAL_C_INCLUDES := $(mke2fs_c_includes)
 LOCAL_CFLAGS := $(mke2fs_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(mke2fs_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(mke2fs_shared_libraries))
 LOCAL_MODULE := mke2fs_host
 LOCAL_MODULE_STEM := mke2fs
 LOCAL_MODULE_TAGS := optional
@@ -54,14 +52,12 @@ include $(BUILD_HOST_EXECUTABLE)
 #
 tune2fs_src_files := \
        tune2fs.c \
-       plausible.c \
        util.c
 
 tune2fs_c_includes := \
-       external/e2fsprogs/lib \
        external/e2fsprogs/e2fsck
 
-tune2fs_cflags := -O2 -g -W -Wall
+tune2fs_cflags := -O2 -g -W -Wall -DNO_RECOVERY
 
 tune2fs_shared_libraries := \
        libext2fs \
@@ -124,7 +120,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(tune2fs_src_files)
 LOCAL_C_INCLUDES := $(tune2fs_c_includes)
 LOCAL_CFLAGS := $(tune2fs_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(tune2fs_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(tune2fs_shared_libraries))
 LOCAL_MODULE := tune2fs_host
 LOCAL_MODULE_STEM := tune2fs
 LOCAL_MODULE_TAGS := optional
@@ -139,8 +135,7 @@ include $(CLEAR_VARS)
 badblocks_src_files := \
        badblocks.c
 
-badblocks_c_includes := \
-       external/e2fsprogs/lib
+badblocks_c_includes :=
 
 badblocks_cflags := -O2 -g -W -Wall
 
@@ -170,7 +165,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(badblocks_src_files)
 LOCAL_C_INCLUDES := $(badblocks_c_includes)
 LOCAL_CFLAGS := $(badblocks_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(badblocks_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(badblocks_shared_libraries))
 LOCAL_MODULE := badblocks_host
 LOCAL_MODULE_STEM := badblocks
 LOCAL_MODULE_TAGS := optional
@@ -213,7 +208,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(chattr_src_files)
 LOCAL_C_INCLUDES := $(chattr_c_includes)
 LOCAL_CFLAGS := $(chattr_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(chattr_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(chattr_shared_libraries))
 LOCAL_MODULE := chattr_host
 LOCAL_MODULE_STEM := chattr
 LOCAL_MODULE_TAGS := optional
@@ -239,6 +234,12 @@ lsattr_shared_libraries := \
 
 lsattr_system_shared_libraries := libc
 
+lsattr_static_libraries := \
+       libext2_com_err \
+       libext2_e2p
+
+lsattr_system_static_libraries := libc
+
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(lsattr_src_files)
@@ -256,7 +257,19 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(lsattr_src_files)
 LOCAL_C_INCLUDES := $(lsattr_c_includes)
 LOCAL_CFLAGS := $(lsattr_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(lsattr_shared_libraries))
+LOCAL_STATIC_LIBRARIES := $(lsattr_static_libraries) $(lsattr_system_static_libraries)
+LOCAL_FORCE_STATIC_EXECUTABLE := true
+LOCAL_MODULE := lsattr_static
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(lsattr_src_files)
+LOCAL_C_INCLUDES := $(lsattr_c_includes)
+LOCAL_CFLAGS := $(lsattr_cflags)
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(lsattr_shared_libraries))
 LOCAL_MODULE := lsattr_host
 LOCAL_MODULE_STEM := lsattr
 LOCAL_MODULE_TAGS := optional
@@ -271,8 +284,7 @@ include $(CLEAR_VARS)
 blkid_src_files := \
     blkid.c
 
-blkid_c_includes := \
-    external/e2fsprogs/lib
+blkid_c_includes :=
 
 blkid_cflags := -O2 -g -W -Wall
 
@@ -325,10 +337,11 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(e4crypt_src_files)
 LOCAL_C_INCLUDES := $(e4crypt_c_includes)
 LOCAL_CFLAGS := $(e4crypt_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(e4crypt_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(e4crypt_shared_libraries))
 LOCAL_MODULE := e4crypt_host
 LOCAL_MODULE_STEM := e4crypt
 LOCAL_MODULE_TAGS := optional
+LOCAL_MODULE_HOST_OS := linux
 
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -336,8 +349,7 @@ include $(BUILD_HOST_EXECUTABLE)
 # Build e2image
 #
 e2image_src_files := \
-       e2image.c \
-       plausible.c
+       e2image.c
 
 e2image_c_includes := \
        external/e2fsprogs/lib
@@ -347,7 +359,8 @@ e2image_cflags := -O2 -g -W -Wall
 e2image_shared_libraries := \
        libext2fs \
        libext2_blkid \
-       libext2_com_err
+       libext2_com_err \
+       libext2_quota
 
 e2image_system_shared_libraries := libc
 
@@ -368,7 +381,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(e2image_src_files)
 LOCAL_C_INCLUDES := $(e2image_c_includes)
 LOCAL_CFLAGS := $(e2image_cflags)
-LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(e2image_shared_libraries))
+LOCAL_SHARED_LIBRARIES := $(addsuffix -host, $(e2image_shared_libraries))
 LOCAL_MODULE := e2image_host
 LOCAL_MODULE_STEM := e2image
 LOCAL_MODULE_TAGS := optional