commit 4a8c4ce403f702c0b8279873fae3d62497c4a123
author Elliott Hughes <enh@google.com> Tue Aug 18 00:23:49 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Aug 18 00:23:49 2015 +0000
tree d34618ee4fe1785e3a64969de35884fa2da05f9f
parent 85197af92b52dd02caa7146ea5f47fad5cbc0101
parent 2926f9a31ef18fbf22922135895cb4c6790d3ad0

Merge "libc: remove bcopy from memmove on 64-bit architectures"

linker/Android.mk

diff --git a/linker/Android.mk b/linker/Android.mk
index 8422018..d8487d3 100644
--- a/linker/Android.mk
+++ b/linker/Android.mk
@@ -83,8 +83,6 @@
 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 @@
 	@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))