Revert "Revert "Split out liblinker_malloc static library""
This reverts commit 3bbeca7a1ae3d31cddd97fb6a0140c4cf7e39f8e.
Change-Id: I5a757fcd52a14442c2eb7ca53f7d1f1923a4efe9
diff --git a/linker/Android.mk b/linker/Android.mk
index 85ac0ca..b940690 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -1,6 +1,20 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
+LOCAL_CLANG := true
+
+LOCAL_MODULE := liblinker_malloc
+
+LOCAL_SRC_FILES := \
+ linker_allocator.cpp \
+ linker_memory.cpp
+
+# We need to access Bionic private headers in the linker.
+LOCAL_CFLAGS += -I$(LOCAL_PATH)/../libc/
+
+include $(BUILD_STATIC_LIBRARY)
+
+include $(CLEAR_VARS)
LOCAL_CLANG := true
@@ -8,11 +22,9 @@
debugger.cpp \
dlfcn.cpp \
linker.cpp \
- linker_allocator.cpp \
linker_block_allocator.cpp \
linker_libc_support.c \
linker_mapped_file_fragment.cpp \
- linker_memory.cpp \
linker_phdr.cpp \
linker_sdk_versions.cpp \
linker_utils.cpp \
@@ -65,6 +77,10 @@
LOCAL_STATIC_LIBRARIES := libc_nomalloc libziparchive libutils libbase libz liblog
+# Important: The liblinker_malloc should be the last library in the list
+# to overwrite any other malloc implementations by other static libraries.
+LOCAL_STATIC_LIBRARIES += liblinker_malloc
+
LOCAL_FORCE_STATIC_EXECUTABLE := true
LOCAL_MODULE := linker