commit 3bbeca7a1ae3d31cddd97fb6a0140c4cf7e39f8e
author Dimitry Ivanov <dimitry@google.com> Mon Feb 15 19:19:35 2016 +0000
committer Dimitry Ivanov <dimitry@google.com> Mon Feb 15 19:19:35 2016 +0000
tree ebd6b34509a2198628aa5a25b76a8ff4af4c2804
parent a80564318a87c1efe76224b8591c707c54d51d2d

Revert "Split out liblinker_malloc static library"

This reverts commit a80564318a87c1efe76224b8591c707c54d51d2d.

Change-Id: I63f16739a38f40ad930692176a4297ad1ce89570

linker/tests/Android.mk

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)