summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIliyan Malchev <malchev@google.com>2011-03-14 14:02:18 -0700
committerIliyan Malchev <malchev@google.com>2011-03-14 14:24:26 -0700
commitc72ab98be7288d86980797b4f6295d73de5ca56f (patch)
tree4e0b94c4cdd73f580013dae9bc304b7aa14e25c6
parent61d6591c827dbea6db9bd29b17a5679d6e2c0d50 (diff)
downloadextras-c72ab98be7288d86980797b4f6295d73de5ca56f.tar.gz
system/extras: remove LOCAL_PRELINK_MODULE
Change-Id: Iafd936bcb30e3fcc18c522a701d567dd744f2fa3 Signed-off-by: Iliyan Malchev <malchev@google.com>
-rw-r--r--ext4_utils/Android.mk4
-rw-r--r--libublock/Android.mk2
-rw-r--r--tests/bionic/libc/Android.mk8
-rw-r--r--tests/lib/testUtil/Android.mk2
4 files changed, 8 insertions, 8 deletions
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index 57d09965..417c839e 100644
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -22,7 +22,7 @@ LOCAL_MODULE := libext4_utils
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES += external/zlib
LOCAL_SHARED_LIBRARIES := libz
-LOCAL_PRELINK_MODULE := false
+
include $(BUILD_SHARED_LIBRARY)
@@ -33,7 +33,7 @@ LOCAL_MODULE := libext4_utils
LOCAL_MODULE_TAGS := optional
LOCAL_C_INCLUDES += external/zlib
LOCAL_STATIC_LIBRARIES := libz
-LOCAL_PRELINK_MODULE := false
+
include $(BUILD_STATIC_LIBRARY)
diff --git a/libublock/Android.mk b/libublock/Android.mk
index 50663ecf..690c5e8e 100644
--- a/libublock/Android.mk
+++ b/libublock/Android.mk
@@ -19,5 +19,5 @@ LOCAL_MODULE := libublock
LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := ublock.c
LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-LOCAL_PRELINK_MODULE := false
+
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/bionic/libc/Android.mk b/tests/bionic/libc/Android.mk
index 60279453..5dcf130a 100644
--- a/tests/bionic/libc/Android.mk
+++ b/tests/bionic/libc/Android.mk
@@ -171,7 +171,7 @@ $(call device-test, $(sources))
include $(CLEAR_VARS)
LOCAL_SRC_FILES := bionic/lib_relocs.c
LOCAL_MODULE := libtest_relocs
-LOCAL_PRELINK_MODULE := false
+
LOCAL_MODULE_TAGS := tests
include $(BUILD_SHARED_LIBRARY)
@@ -190,7 +190,7 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := bionic/lib_static_init.cpp
LOCAL_MODULE := libtest_static_init
-LOCAL_PRELINK_MODULE := false
+
LOCAL_MODULE_TAGS := tests
include $(BUILD_SHARED_LIBRARY)
@@ -206,7 +206,7 @@ include $(BUILD_EXECUTABLE)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := bionic/libdlclosetest1.cpp
LOCAL_MODULE := libdlclosetest1
-LOCAL_PRELINK_MODULE := false
+
LOCAL_MODULE_TAGS := tests
include $(BUILD_SHARED_LIBRARY)
@@ -215,7 +215,7 @@ include $(BUILD_SHARED_LIBRARY)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := bionic/libdlclosetest2.c
LOCAL_MODULE := libdlclosetest2
-LOCAL_PRELINK_MODULE := false
+
LOCAL_MODULE_TAGS := tests
include $(BUILD_SHARED_LIBRARY)
diff --git a/tests/lib/testUtil/Android.mk b/tests/lib/testUtil/Android.mk
index 42758aeb..f814dac3 100644
--- a/tests/lib/testUtil/Android.mk
+++ b/tests/lib/testUtil/Android.mk
@@ -23,6 +23,6 @@ LOCAL_SRC_FILES:= testUtil.c
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../include
LOCAL_CFLAGS += -std=c99
LOCAL_SHARED_LIBRARIES += libcutils libutils
-LOCAL_PRELINK_MODULE := false
+
include $(BUILD_STATIC_LIBRARY)