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

am 85197af9: Merge "Don\'t attach linker_asan to linker in module definition."

Browse Source 
* commit '85197af92b52dd02caa7146ea5f47fad5cbc0101':
  Don't attach linker_asan to linker in module definition.
This commit is contained in:
Ying Wang 2015-08-18 00:23:29 +00:00 committed by Android Git Automerger
commit e46c4212d6
1 changed files with 0 additions and 6 deletions
Show Stats 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)
ifeq (address, $(strip $(SANITIZE_TARGET)))
define add-linker-symlink
$(eval _from := $(TARGET_OUT)/bin/$(1))
$(eval _to:=$(2))
@ -93,15 +91,11 @@ $(_from): $(LOCAL_MODULE_MAKEFILE)
@mkdir -p $$(dir $$@)
@rm -rf $$@
$(hide) ln -sf $(_to) $$@
ALL_MODULES.linker.INSTALLED += $(_from)
linker: $(_from)
endef
$(eval $(call add-linker-symlink,linker_asan,linker))
ifeq ($(TARGET_IS_64_BIT),true)
$(eval $(call add-linker-symlink,linker_asan64,linker64))
endif
ALL_MODULES += linker
endif
include $(call first-makefiles-under,$(LOCAL_PATH))