From d1afa661af3686e487646fe36641c1b4080687d3 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 17 Aug 2015 16:17:03 -0700 Subject: [PATCH] Don't attach linker_asan to linker in module definition. 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 --- linker/Android.mk | 6 ------ 1 file changed, 6 deletions(-) diff --git a/linker/Android.mk b/linker/Android.mk index 8422018f5..d8487d32e 100644 --- a/linker/Android.mk +++ b/linker/Android.mk @@ -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))