Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 96983cba authored by Dan Albert's avatar Dan Albert Committed by Android Git Automerger
Browse files

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

* commit 'cc0aa4da':
  We also need -rdynamic for host ASAN.
parents 66acb2a8 cc0aa4da

core/binary.mk

+2 −0
Original line number Diff line number Diff line
@@ -184,12 +184,14 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true) 
  my_cflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS)

  my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS)

  ifdef LOCAL_IS_HOST_MODULE

      my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_HOST)

      my_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_HOST)

      my_shared_libraries += \

          $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_HOST)

      my_static_libraries += \

          $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_HOST)

  else

      my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_TARGET)

      my_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET)

      my_shared_libraries += \

          $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET)

core/clang/config.mk

+2 −0
Original line number Diff line number Diff line
@@ -94,10 +94,12 @@ 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 $(ADDRESS_SANITIZER_RUNTIME_LIBRARY)

ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET := libasan