Stop use of LOCAL_MODULE_STEM for libraries.android-4.1_pre1

Bug: 5573756
The uses of LOCAL_MODULE_STEM are unnecessary here.
To implement the feature requested by bug 5573756, we need  library
name to be the same as its module name.

Change-Id: Ibbea9c1e1f4f8f2f5af0b467787ccb214c47d3fd

8 files changed, 8 insertions, 20 deletions

diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk
index 39a9d258..7a9d514b 100644
--- a/e2fsck/Android.mk
+++ b/e2fsck/Android.mk
@@ -55,12 +55,10 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2_profile_src_files)
-LOCAL_SHARED_LIBRARIES := $(libext2_profile_shared_libraries)
+LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_profile_shared_libraries))
 LOCAL_C_INCLUDES := $(libext2_profile_c_includes)
 LOCAL_CFLAGS := $(libext2_profile_cflags)
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_profile_host
-LOCAL_MODULE_STEM := libext2_profile
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
@@ -152,7 +150,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(e2fsck_src_files)
 LOCAL_C_INCLUDES := $(e2fsck_c_includes)
 LOCAL_CFLAGS := $(e2fsck_cflags)
-LOCAL_SHARED_LIBRARIES := $(e2fsck_shared_libraries)
+LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(e2fsck_shared_libraries))
 LOCAL_MODULE := e2fsck_host
 LOCAL_MODULE_STEM := e2fsck
 LOCAL_MODULE_TAGS := optional
diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk
index 4cbd4e25..78ba517b 100644
--- a/lib/blkid/Android.mk
+++ b/lib/blkid/Android.mk
@@ -64,16 +64,14 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2_blkid_src_files)
-LOCAL_SHARED_LIBRARIES := $(libext2_blkid_shared_libraries)
+LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2_blkid_shared_libraries))
 LOCAL_C_INCLUDES := $(libext2_blkid_c_includes)
 ifeq ($(HOST_OS),linux)
 LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux)
 else
 LOCAL_CFLAGS := $(libext2_blkid_cflags)
 endif
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_blkid_host
-LOCAL_MODULE_STEM := libext2_blkid
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/e2p/Android.mk b/lib/e2p/Android.mk
index e8b0211e..3f55a6bc 100644
--- a/lib/e2p/Android.mk
+++ b/lib/e2p/Android.mk
@@ -68,9 +68,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(libext2_e2p_src_files)
 LOCAL_C_INCLUDES := $(libext2_e2p_c_includes)
 LOCAL_CFLAGS := $(libext2_e2p_cflags)
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2_e2p_host
-LOCAL_MODULE_STEM := libext2_e2p
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/et/Android.mk b/lib/et/Android.mk
index 8e442f08..15354ddb 100644
--- a/lib/et/Android.mk
+++ b/lib/et/Android.mk
@@ -60,8 +60,6 @@ else
 LOCAL_CFLAGS := $(libext2_com_err_cflags)
 endif
 LOCAL_MODULE := libext2_com_err_host
-LOCAL_MODULE_STEM := libext2_com_err
 LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk
index 6ce9f989..03a5a2e2 100644
--- a/lib/ext2fs/Android.mk
+++ b/lib/ext2fs/Android.mk
@@ -116,16 +116,14 @@ include $(BUILD_SHARED_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES := $(libext2fs_src_files)
-LOCAL_SHARED_LIBRARIES := $(libext2fs_shared_libraries)
+LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(libext2fs_shared_libraries))
 LOCAL_C_INCLUDES := $(libext2fs_c_includes)
 ifeq ($(HOST_OS),linux)
 LOCAL_CFLAGS := $(libext2fs_cflags) $(libext2fs_cflags_linux)
 else
 LOCAL_CFLAGS := $(libext2fs_cflags)
 endif
-LOCAL_PRELINK_MODULE := false
 LOCAL_MODULE := libext2fs_host
-LOCAL_MODULE_STEM := libext2fs
 LOCAL_MODULE_TAGS := optional
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/lib/uuid/Android.mk b/lib/uuid/Android.mk
index 77015149..fc42055a 100644
--- a/lib/uuid/Android.mk
+++ b/lib/uuid/Android.mk
@@ -61,8 +61,6 @@ LOCAL_SRC_FILES := $(libext2_uuid_src_files)
 LOCAL_C_INCLUDES := $(libext2_uuid_c_includes)
 LOCAL_CFLAGS := $(libext2_uuid_cflags)
 LOCAL_MODULE := libext2_uuid_host
-LOCAL_MODULE_STEM := libext2_uuid
 LOCAL_MODULE_TAGS := optional
-LOCAL_PRELINK_MODULE := false
 
 include $(BUILD_HOST_SHARED_LIBRARY)
diff --git a/misc/Android.mk b/misc/Android.mk
index 8c5a21a8..5b4d9218 100644
--- a/misc/Android.mk
+++ b/misc/Android.mk
@@ -72,7 +72,7 @@ LOCAL_CFLAGS := $(mke2fs_cflags) $(mke2fs_cflags_linux)
 else
 LOCAL_CFLAGS := $(mke2fs_cflags)
 endif
-LOCAL_SHARED_LIBRARIES := $(mke2fs_shared_libraries)
+LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(mke2fs_shared_libraries))
 LOCAL_MODULE := mke2fs_host
 LOCAL_MODULE_STEM := mke2fs
 LOCAL_MODULE_TAGS := optional
@@ -145,7 +145,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(tune2fs_src_files)
 LOCAL_C_INCLUDES := $(tune2fs_c_includes)
 LOCAL_CFLAGS := $(tune2fs_cflags)
-LOCAL_SHARED_LIBRARIES := $(tune2fs_shared_libraries)
+LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(tune2fs_shared_libraries))
 LOCAL_MODULE := tune2fs_host
 LOCAL_MODULE_STEM := tune2fs
 LOCAL_MODULE_TAGS := optional
@@ -216,7 +216,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(badblocks_src_files)
 LOCAL_C_INCLUDES := $(badblocks_c_includes)
 LOCAL_CFLAGS := $(badblocks_cflags)
-LOCAL_SHARED_LIBRARIES := $(badblocks_shared_libraries)
+LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(badblocks_shared_libraries))
 LOCAL_MODULE := badblocks_host
 LOCAL_MODULE_STEM := badblocks
 LOCAL_MODULE_TAGS := optional
diff --git a/resize/Android.mk b/resize/Android.mk
index 41d90e5c..1caafe97 100644
--- a/resize/Android.mk
+++ b/resize/Android.mk
@@ -59,7 +59,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(resize2fs_src_files)
 LOCAL_C_INCLUDES := $(resize2fs_c_includes)
 LOCAL_CFLAGS := $(resize2fs_cflags)
-LOCAL_SHARED_LIBRARIES := $(resize2fs_shared_libraries)
+LOCAL_SHARED_LIBRARIES := $(addsuffix _host, $(resize2fs_shared_libraries))
 LOCAL_MODULE := resize2fs_host
 LOCAL_MODULE_STEM := resize2fs
 LOCAL_MODULE_TAGS := optional