From: Theodore Ts'o <tytso@mit.edu>
Date: Thu, 23 Jul 2015 16:46:42 +0000 (-0400)
Subject: android: be able to build dumpe2fs, lsattr, and e2fsck statically
X-Git-Tag: v1.43-WIP-2016-03-15~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e695c12892d0de5e6a3087fffb532e68e0b02242;p=thirdparty%2Fe2fsprogs.git

android: be able to build dumpe2fs, lsattr, and e2fsck statically

Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/debugfs/Android.mk b/debugfs/Android.mk
index 80b5ec3a8..220050935 100644
--- a/debugfs/Android.mk
+++ b/debugfs/Android.mk
@@ -40,6 +40,17 @@ debugfs_shared_libraries := \
 
 debugfs_system_shared_libraries := libc
 
+debugfs_static_libraries := \
+	libext2fs \
+	libext2_blkid \
+	libext2_uuid_static \
+	libext2_ss \
+	libext2_quota \
+	libext2_com_err \
+	libext2_e2p
+
+debugfs_system_static_libraries := libc
+
 debugfs_c_includes := \
 	external/e2fsprogs/e2fsck \
 	external/e2fsprogs/misc \
@@ -60,6 +71,17 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
+LOCAL_SRC_FILES := $(debugfs_src_files)
+LOCAL_C_INCLUDES := $(debugfs_c_includes)
+LOCAL_CFLAGS := $(debugfs_cflags)
+LOCAL_STATIC_LIBRARIES := $(debugfs_static_libraries) $(debugfs_system_static_libraries)
+LOCAL_FORCE_STATIC_EXECUTABLE := true
+LOCAL_MODULE := debugfs_static
+LOCAL_MODULE_TAGS := optional
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
 LOCAL_SRC_FILES := $(debugfs_src_files)
 LOCAL_C_INCLUDES := $(debugfs_c_includes)
 LOCAL_CFLAGS := $(debugfs_cflags)
diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk
index 9726589a8..30f2d55b8 100644
--- a/e2fsck/Android.mk
+++ b/e2fsck/Android.mk
@@ -39,8 +39,19 @@ e2fsck_shared_libraries := \
 	libext2_quota \
 	libext2_com_err \
 	libext2_e2p
+
 e2fsck_system_shared_libraries := libc
 
+e2fsck_static_libraries := \
+	libext2fs \
+	libext2_blkid \
+	libext2_uuid_static \
+	libext2_quota \
+	libext2_com_err \
+	libext2_e2p
+
+e2fsck_system_static_libraries := libc
+
 e2fsck_c_includes := external/e2fsprogs/lib
 
 e2fsck_cflags := -O2 -g -W -Wall -fno-strict-aliasing
@@ -58,6 +69,18 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
+LOCAL_SRC_FILES := $(e2fsck_src_files)
+LOCAL_C_INCLUDES := $(e2fsck_c_includes)
+LOCAL_CFLAGS := $(e2fsck_cflags)
+LOCAL_STATIC_LIBRARIES := $(e2fsck_static_libraries) $(e2fsck_system_static_libraries)
+LOCAL_FORCE_STATIC_EXECUTABLE := true
+LOCAL_MODULE := e2fsck_static
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
 LOCAL_SRC_FILES := $(e2fsck_src_files)
 LOCAL_C_INCLUDES := $(e2fsck_c_includes)
 LOCAL_CFLAGS := $(e2fsck_cflags)
diff --git a/lib/ss/Android.mk b/lib/ss/Android.mk
index 9231793ed..21e380ff1 100644
--- a/lib/ss/Android.mk
+++ b/lib/ss/Android.mk
@@ -39,6 +39,18 @@ include $(BUILD_SHARED_LIBRARY)
 
 include $(CLEAR_VARS)
 
+LOCAL_SRC_FILES := $(libext2_ss_src_files)
+LOCAL_C_INCLUDES := $(libext2_ss_c_includes)
+LOCAL_CFLAGS := $(libext2_ss_cflags)
+LOCAL_STATIC_LIBRARIES := libc
+LOCAL_MODULE := libext2_ss
+LOCAL_MODULE_TAGS := optional
+LOCAL_PRELINK_MODULE := false
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
 LOCAL_SRC_FILES := $(libext2_ss_src_files)
 LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_ss_shared_libraries))
 LOCAL_C_INCLUDES := $(libext2_ss_c_includes)
diff --git a/misc/Android.mk b/misc/Android.mk
index 2ea323a89..5ab514168 100644
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -237,6 +237,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)
@@ -251,6 +257,18 @@ include $(BUILD_EXECUTABLE)
 
 include $(CLEAR_VARS)
 
+LOCAL_SRC_FILES := $(lsattr_src_files)
+LOCAL_C_INCLUDES := $(lsattr_c_includes)
+LOCAL_CFLAGS := $(lsattr_cflags)
+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)