generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Don't attach linker_asan to linker in module definition."

Browse Source
This commit is contained in:
Ying Wang
2015-08-18 00:07:03 +00:00
committed by Gerrit Code Review
parent 6816d8cc69 d1afa661af
commit 85197af92b
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
linker/Android.mk
View File

@@ -83,8 +83,6 @@ LOCAL_POST_LINK_CMD = $(hide) $($(LOCAL_2ND_ARCH_VAR_PREFIX)TARGET_OBJCOPY) \
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)
ifeq (address, $(strip $(SANITIZE_TARGET)))
define add-linker-symlink define add-linker-symlink
$(eval _from := $(TARGET_OUT)/bin/$(1)) $(eval _from := $(TARGET_OUT)/bin/$(1))
$(eval _to:=$(2)) $(eval _to:=$(2))
@@ -93,15 +91,11 @@ $(_from): $(LOCAL_MODULE_MAKEFILE)
@mkdir -p $$(dir $$@) @mkdir -p $$(dir $$@)
@rm -rf $$@ @rm -rf $$@
$(hide) ln -sf $(_to) $$@ $(hide) ln -sf $(_to) $$@
ALL_MODULES.linker.INSTALLED += $(_from)
linker: $(_from)
endef endef
$(eval $(call add-linker-symlink,linker_asan,linker)) $(eval $(call add-linker-symlink,linker_asan,linker))
ifeq ($(TARGET_IS_64_BIT),true) ifeq ($(TARGET_IS_64_BIT),true)
$(eval $(call add-linker-symlink,linker_asan64,linker64)) $(eval $(call add-linker-symlink,linker_asan64,linker64))
endif endif
ALL_MODULES += linker
endif
include $(call first-makefiles-under,$(LOCAL_PATH)) include $(call first-makefiles-under,$(LOCAL_PATH))