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

Don't attach linker_asan to linker in module definition.

Browse Source 
With this change, we only define the rules to create the symlinks in
this Android.mk but without attaching the symlinks to the module linker.
Instead the core build system will set up the dependency whenever a
module needs these symlinks.

Bug: 22850550
Change-Id: I36c58fd411f1c27f3f638b229699d7dc1d66abb2
This commit is contained in:
Ying Wang 2015-08-17 16:17:03 -07:00
parent 6816d8cc69
commit d1afa661af
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))