am cc0aa4da: am 28c265dd: Merge "We also need -rdynamic for host ASAN."

* commit 'cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
  We also need -rdynamic for host ASAN.

diff --cc core/binary.mk
Simple merge

diff --cc core/clang/config.mk
index 37eeae1,03b5362..0027cbf
--- 1/core/clang/config.mk
--- 2/core/clang/config.mk
+++ b/core/clang/config.mk
@@@ -90,16 -90,17 +90,18 @@@ include $(BUILD_SYSTEM)/clang/TARGET_$(
  endif
  
  # Address sanitizer clang config
 -ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address
 +ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan_$(TARGET_ARCH)_android
 +ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address -fno-omit-frame-pointer
  ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit
  
+ ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_HOST := -rdynamic
  ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_HOST := -lpthread -ldl
  ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_HOST :=
  ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_HOST := libasan
  
+ ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_TARGET :=
  ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET :=
 -ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET := libdl libasan_preload
 +ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET := libdl $(ADDRESS_SANITIZER_RUNTIME_LIBRARY)
  ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET := libasan
  
  # This allows us to use the superset of functionality that compiler-rt