tequilaOS/platform_bionic
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Revert "Split out liblinker_malloc static library"

Browse source 
This reverts commit a80564318a.

Change-Id: I63f16739a38f40ad930692176a4297ad1ce89570
This commit is contained in:
Dimitry Ivanov 2016-02-15 19:19:35 +00:00
parent a80564318a
commit 3bbeca7a1a
2 changed files with 4 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
linker/Android.mk
View file

@ -1,19 +1,5 @@
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 @@ LOCAL_SRC_FILES := \
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_ASFLAGS := $(LOCAL_CFLAGS)
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

3
linker/tests/Android.mk
View file

@ -32,12 +32,11 @@ LOCAL_SRC_FILES := \
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)