aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Kondik <steve@cyngn.com>2015-03-22 01:23:46 -0700
committerSteve Kondik <steve@cyngn.com>2015-03-22 01:23:46 -0700
commitd0a2126a53a0ca1e72097ffb1390f7d04fb17a5d (patch)
tree716ce9f0f977d2be7ceeacb6a95758ba701178cf
parent0f37ade7a7ab33a1e86e51f3ec696e9b26c62563 (diff)
downloadandroid_external_e2fsprogs-stable/cm-12.1-YOG7D.tar.gz
android_external_e2fsprogs-stable/cm-12.1-YOG7D.tar.bz2
android_external_e2fsprogs-stable/cm-12.1-YOG7D.zip
* Remove duplicate modules Change-Id: If68c5685a76943bc6bfdcb630c15c2f9ac59effd
-rw-r--r--lib/blkid/Android.mk12
-rw-r--r--lib/e2p/Android.mk13
-rw-r--r--lib/et/Android.mk12
-rw-r--r--lib/ext2fs/Android.mk12
-rw-r--r--lib/quota/Android.mk12
5 files changed, 0 insertions, 61 deletions
diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk
index 28ab1dc9..6131f3e4 100644
--- a/lib/blkid/Android.mk
+++ b/lib/blkid/Android.mk
@@ -83,18 +83,6 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_blkid_src_files)
-LOCAL_STATIC_LIBRARIES := $(libext2_blkid_system_shared_libraries) $(libext2_blkid_shared_libraries)
-LOCAL_C_INCLUDES := $(libext2_blkid_c_includes)
-LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux)
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE := libext2_blkid
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(libext2_blkid_src_files)
LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_blkid_shared_libraries))
LOCAL_C_INCLUDES := $(libext2_blkid_c_includes)
ifeq ($(HOST_OS),linux)
diff --git a/lib/e2p/Android.mk b/lib/e2p/Android.mk
index 94ae128d..104c1305 100644
--- a/lib/e2p/Android.mk
+++ b/lib/e2p/Android.mk
@@ -66,19 +66,6 @@ LOCAL_MODULE_TAGS := optional
include $(BUILD_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_STATIC_LIBRARIES := $(libext2_e2p_system_shared_libraries)
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE := libext2_e2p
-LOCAL_MODULE_TAGS := eng
-
-include $(BUILD_STATIC_LIBRARY)
-
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_e2p_src_files)
diff --git a/lib/et/Android.mk b/lib/et/Android.mk
index 756febca..3ef83e5a 100644
--- a/lib/et/Android.mk
+++ b/lib/et/Android.mk
@@ -67,18 +67,6 @@ 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 := eng
-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
diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk
index a2419e67..fd9b7a7d 100644
--- a/lib/ext2fs/Android.mk
+++ b/lib/ext2fs/Android.mk
@@ -146,18 +146,6 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2fs_src_files)
-LOCAL_STATIC_LIBRARIES := $(libext2fs_system_shared_libraries) $(libext2fs_shared_libraries)
-LOCAL_C_INCLUDES := $(libext2fs_c_includes)
-LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE := libext2fs
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(libext2fs_src_files)
LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2fs_shared_libraries))
LOCAL_C_INCLUDES := $(libext2fs_c_includes)
ifeq ($(HOST_OS),linux)
diff --git a/lib/quota/Android.mk b/lib/quota/Android.mk
index 08bd0dd2..c5ec5140 100644
--- a/lib/quota/Android.mk
+++ b/lib/quota/Android.mk
@@ -56,18 +56,6 @@ include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(libext2_quota_src_files)
LOCAL_C_INCLUDES := $(libext2_quota_c_includes)
LOCAL_CFLAGS := $(libext2_quota_cflags)
-LOCAL_STATIC_LIBRARIES := libc $(libext2_quota_static_libraries)
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE := libext2_quota
-LOCAL_MODULE_TAGS := optional
-
-include $(BUILD_STATIC_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := $(libext2_quota_src_files)
-LOCAL_C_INCLUDES := $(libext2_quota_c_includes)
-LOCAL_CFLAGS := $(libext2_quota_cflags)
LOCAL_SYSTEM_STATIC_LIBRARIES := libc $(libext2_quota_shared_libraries) libext2fs
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE := libext2_quota