Revert "Split out liblinker_malloc static library"
This reverts commit a80564318a87c1efe76224b8591c707c54d51d2d.
Change-Id: I63f16739a38f40ad930692176a4297ad1ce89570
diff --git a/linker/Android.mk b/linker/Android.mk
index 5bbe172..85ac0ca 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -1,20 +1,6 @@
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
@@ -22,9 +8,11 @@
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 \
@@ -75,7 +63,7 @@
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_STATIC_LIBRARIES := libc_nomalloc liblinker_malloc libziparchive libutils libbase libz liblog
+LOCAL_STATIC_LIBRARIES := libc_nomalloc libziparchive libutils libbase libz liblog
LOCAL_FORCE_STATIC_EXECUTABLE := true
diff --git a/linker/tests/Android.mk b/linker/tests/Android.mk
index e9f43e9..a061877 100644
--- a/linker/tests/Android.mk
+++ b/linker/tests/Android.mk
@@ -32,12 +32,11 @@
linker_block_allocator_test.cpp \
../linker_block_allocator.cpp \
linker_memory_allocator_test.cpp \
+ ../linker_allocator.cpp \
linker_utils_test.cpp \
../linker_utils.cpp
# for __libc_fatal
LOCAL_SRC_FILES += ../../libc/bionic/libc_logging.cpp
-LOCAL_STATIC_LIBRARIES := liblinker_malloc
-
include $(BUILD_NATIVE_TEST)