diff options
| author | Ying Wang <wangying@google.com> | 2014-12-16 21:50:08 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-16 21:50:08 +0000 |
| commit | aeb5e73d635c063abe9bcfd9a12450e1c7be038c (patch) | |
| tree | 489146a97404ed6abd7208095e06073e5d01a878 | |
| parent | 72601c0d1793f405af8c19f7f20e3f70e420eab6 (diff) | |
| parent | 5faf22b50d92805553d373da1a24b71c695df177 (diff) | |
| download | android_external_e2fsprogs-aeb5e73d635c063abe9bcfd9a12450e1c7be038c.tar.gz android_external_e2fsprogs-aeb5e73d635c063abe9bcfd9a12450e1c7be038c.tar.bz2 android_external_e2fsprogs-aeb5e73d635c063abe9bcfd9a12450e1c7be038c.zip | |
am 5faf22b5: am a72d7e9d: Merge "Cleanup Obsolete LOCAL_PRELINK_MODULE."
* commit '5faf22b50d92805553d373da1a24b71c695df177':
Cleanup Obsolete LOCAL_PRELINK_MODULE.
| -rw-r--r-- | e2fsck/Android.mk | 1 | ||||
| -rw-r--r-- | lib/blkid/Android.mk | 1 | ||||
| -rw-r--r-- | lib/e2p/Android.mk | 1 | ||||
| -rw-r--r-- | lib/et/Android.mk | 1 | ||||
| -rw-r--r-- | lib/ext2fs/Android.mk | 1 | ||||
| -rw-r--r-- | lib/quota/Android.mk | 1 | ||||
| -rw-r--r-- | lib/uuid/Android.mk | 2 |
7 files changed, 0 insertions, 8 deletions
diff --git a/e2fsck/Android.mk b/e2fsck/Android.mk index c6e08c22..b4b2aef9 100644 --- a/e2fsck/Android.mk +++ b/e2fsck/Android.mk @@ -48,7 +48,6 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_profile_system_shared_libraries) LOCAL_SHARED_LIBRARIES := $(libext2_profile_shared_libraries) LOCAL_C_INCLUDES := $(libext2_profile_c_includes) LOCAL_CFLAGS := $(libext2_profile_cflags) -LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libext2_profile LOCAL_MODULE_TAGS := optional diff --git a/lib/blkid/Android.mk b/lib/blkid/Android.mk index 24c736f6..33be5709 100644 --- a/lib/blkid/Android.mk +++ b/lib/blkid/Android.mk @@ -60,7 +60,6 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_blkid_system_shared_libraries) LOCAL_SHARED_LIBRARIES := $(libext2_blkid_shared_libraries) LOCAL_C_INCLUDES := $(libext2_blkid_c_includes) LOCAL_CFLAGS := $(libext2_blkid_cflags) $(libext2_blkid_cflags_linux) -fno-strict-aliasing -LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libext2_blkid LOCAL_MODULE_TAGS := optional diff --git a/lib/e2p/Android.mk b/lib/e2p/Android.mk index 104c1305..829774df 100644 --- a/lib/e2p/Android.mk +++ b/lib/e2p/Android.mk @@ -60,7 +60,6 @@ LOCAL_SRC_FILES := $(libext2_e2p_src_files) LOCAL_C_INCLUDES := $(libext2_e2p_c_includes) LOCAL_CFLAGS := $(libext2_e2p_cflags) LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_e2p_system_shared_libraries) -LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libext2_e2p LOCAL_MODULE_TAGS := optional diff --git a/lib/et/Android.mk b/lib/et/Android.mk index 3ef83e5a..256f3109 100644 --- a/lib/et/Android.mk +++ b/lib/et/Android.mk @@ -47,7 +47,6 @@ LOCAL_CFLAGS := $(libext2_com_err_cflags) $(libext2_com_err_cflags_linux) LOCAL_SYSTEM_SHARED_LIBRARIES := libc LOCAL_MODULE := libext2_com_err LOCAL_MODULE_TAGS := optional -LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) diff --git a/lib/ext2fs/Android.mk b/lib/ext2fs/Android.mk index fd9b7a7d..11c558fd 100644 --- a/lib/ext2fs/Android.mk +++ b/lib/ext2fs/Android.mk @@ -125,7 +125,6 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2fs_system_shared_libraries) LOCAL_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 diff --git a/lib/quota/Android.mk b/lib/quota/Android.mk index cd10fa39..74a6a07a 100644 --- a/lib/quota/Android.mk +++ b/lib/quota/Android.mk @@ -45,7 +45,6 @@ LOCAL_SRC_FILES := $(libext2_quota_src_files) LOCAL_C_INCLUDES := $(libext2_quota_c_includes) LOCAL_CFLAGS := $(libext2_quota_cflags) LOCAL_SYSTEM_SHARED_LIBRARIES := libc $(libext2_quota_shared_libraries) -LOCAL_PRELINK_MODULE := false LOCAL_MODULE := libext2_quota LOCAL_MODULE_TAGS := optional diff --git a/lib/uuid/Android.mk b/lib/uuid/Android.mk index 5a387da4..f8951600 100644 --- a/lib/uuid/Android.mk +++ b/lib/uuid/Android.mk @@ -52,7 +52,6 @@ LOCAL_CFLAGS := $(libext2_uuid_cflags) LOCAL_SYSTEM_SHARED_LIBRARIES := $(libext2_uuid_system_shared_libraries) LOCAL_MODULE := libext2_uuid LOCAL_MODULE_TAGS := optional -LOCAL_PRELINK_MODULE := false include $(BUILD_SHARED_LIBRARY) @@ -75,7 +74,6 @@ LOCAL_CFLAGS := $(libext2_uuid_cflags) LOCAL_STATIC_LIBRARIES := libc LOCAL_MODULE := libext2_uuid_static LOCAL_MODULE_TAGS := optional -LOCAL_PRELINK_MODULE := false include $(BUILD_STATIC_LIBRARY) |