am a4adfb4e: am a06323d6: Merge "Make asan more closely match clang behavior."

* commit 'a4adfb4ef0dc9129f32c1dcd64f0dedc6c7e61cd':
  Make asan more closely match clang behavior.
This commit is contained in:
Dan Albert 2015-04-28 21:46:05 +00:00 committed by Android Git Automerger
commit 096f7698d8
1 changed files with 2 additions and 1 deletions

View File

@ -78,7 +78,8 @@ ifneq ($(filter address,$(my_sanitize)),)
ifdef LOCAL_IS_HOST_MODULE
# -nodefaultlibs (provided with libc++) prevents the driver from linking
# libraries needed with -fsanitize=address. http://b/18650275 (WAI)
my_ldlibs += -ldl -lpthread
my_ldlibs += -lm -ldl -lpthread
my_ldflags += --no-as-needed
else
# ASan runtime library must be the first in the link order.
my_shared_libraries := $($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_RUNTIME_LIBRARY) \