From: Adrien Schildknecht <adriens@google.com>
Date: Wed, 23 Nov 2016 08:46:47 +0000 (-0800)
Subject: AOSP: android: add rules to build the static host libraries
X-Git-Tag: v1.44.0-rc1~105
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a2731accce6939a39c012887f1dc933bac1c1cfa;p=thirdparty%2Fe2fsprogs.git

AOSP: android: add rules to build the static host libraries

Test: m libext2fs-host

Change-Id: I0f8155bc37516a59cf0ae1545ba37d52025f7a36
From AOSP commit: ef511144c0104bcf2c730888bb39e1c4f95680d2

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

diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk
index 857c4f9de..67228a266 100644
--- a/lib/blkid/Android.mk
+++ b/lib/blkid/Android.mk
@@ -60,3 +60,13 @@ LOCAL_MODULE := libext2_blkid-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+LOCAL_SRC_FILES := $(libext2_blkid_src_files)
+LOCAL_SHARED_LIBRARIES := libext2_uuid-host
+LOCAL_C_INCLUDES := $(libext2_blkid_c_includes)
+LOCAL_CFLAGS := $(libext2_blkid_cflags)
+LOCAL_MODULE := libext2_blkid-host
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/e2p/Android.mk b/lib/e2p/Android.mk
index 8a732c371..279bdbb1a 100644
--- a/lib/e2p/Android.mk
+++ b/lib/e2p/Android.mk
@@ -63,3 +63,13 @@ LOCAL_MODULE := libext2_e2p-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(libext2_e2p_src_files)
+LOCAL_C_INCLUDES := $(libext2_e2p_c_includes)
+LOCAL_CFLAGS := $(libext2_e2p_cflags)
+LOCAL_MODULE := libext2_e2p-host
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/et/Android.mk b/lib/et/Android.mk
index 8704f4c0c..f1b5105ba 100644
--- a/lib/et/Android.mk
+++ b/lib/et/Android.mk
@@ -44,3 +44,13 @@ LOCAL_MODULE := libext2_com_err-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(libext2_com_err_src_files)
+LOCAL_C_INCLUDES := $(libext2_com_err_c_includes)
+LOCAL_CFLAGS := $(libext2_com_err_cflags)
+LOCAL_MODULE := libext2_com_err-host
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk
index 89b1db922..fdb2a7286 100644
--- a/lib/ext2fs/Android.mk
+++ b/lib/ext2fs/Android.mk
@@ -141,3 +141,16 @@ LOCAL_MODULE := libext2fs-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(libext2fs_src_files)
+LOCAL_STATIC_LIBRARIES := $(addsuffix -host, $(libext2fs_shared_libraries))
+LOCAL_STATIC_LIBRARIES := libsparse_host libz
+LOCAL_C_INCLUDES := $(libext2fs_c_includes)
+LOCAL_EXPORT_C_INCLUDE_DIRS := $(libext2fs_c_includes)
+LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
+LOCAL_MODULE := libext2fs-host
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/ss/Android.mk b/lib/ss/Android.mk
index c19acccf3..28733dda5 100644
--- a/lib/ss/Android.mk
+++ b/lib/ss/Android.mk
@@ -58,3 +58,12 @@ LOCAL_MODULE := libext2_ss-host
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_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_MODULE := libext2_ss-host
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_HOST_STATIC_LIBRARY)