am a72d7e9d: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."

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

diff --git a/lib/et/Android.mk b/lib/et/Android.mk
index a7da0e7..256f310 100644 (file)
--- a/lib/et/Android.mk
+++ b/lib/et/Android.mk
@@ -28,6 +28,7 @@ libext2_com_err_cflags := -O2 -g -W -Wall \
        -DHAVE_EXT2_IOCTLS \
        -DHAVE_TYPE_SSIZE_T \
        -DHAVE_SYS_TIME_H \
+        -DHAVE_SYS_PARAM_H \
        -DHAVE_SYSCONF
 
 libext2_com_err_cflags_linux := \
@@ -45,8 +46,7 @@ LOCAL_C_INCLUDES := $(libext2_com_err_c_includes)
 LOCAL_CFLAGS := $(libext2_com_err_cflags) $(libext2_com_err_cflags_linux)
 LOCAL_SYSTEM_SHARED_LIBRARIES := libc
 LOCAL_MODULE := libext2_com_err
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
-LOCAL_PRELINK_MODULE := false
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_SHARED_LIBRARY)
 
@@ -54,14 +54,24 @@ 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) $(libext2_com_err_cflags_linux)
+LOCAL_STATIC_LIBRARIES := libc
+LOCAL_MODULE := libext2_com_err
+LOCAL_MODULE_TAGS := optional
+LOCAL_PRELINK_MODULE := false
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
+
+LOCAL_SRC_FILES := $(libext2_com_err_src_files)
+LOCAL_C_INCLUDES := $(libext2_com_err_c_includes)
 ifeq ($(HOST_OS),linux)
 LOCAL_CFLAGS := $(libext2_com_err_cflags) $(libext2_com_err_cflags_linux)
 else
 LOCAL_CFLAGS := $(libext2_com_err_cflags)
 endif
 LOCAL_MODULE := libext2_com_err_host
-LOCAL_MODULE_STEM := libext2_com_err
-LOCAL_MODULE_TAGS := $(use_e2fsprog_module_tags)
-LOCAL_PRELINK_MODULE := false
+LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)