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

Commit 66acb2a8 authored by Dan Albert's avatar Dan Albert
Browse files

resolved conflicts for merge of 96c22133 to lmp-dev-plus-aosp 

Change-Id: I35a2f403e9e664536b45b5ac9185adf1e1a02442
parents 554e514c 96c22133

core/binary.mk

+13 −2
Original line number Diff line number Diff line
@@ -183,8 +183,19 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true) 
  LOCAL_ARM_MODE := arm

  my_cflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS)

  my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS)

  my_shared_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES)

  my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)

  ifdef LOCAL_IS_HOST_MODULE

      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_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET)

      my_shared_libraries += \

          $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET)

      my_static_libraries += \

          $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET)

  endif

endif



ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true)

core/clang/config.mk

+8 −2
Original line number Diff line number Diff line
@@ -93,8 +93,14 @@ endif 
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_SHARED_LIBRARIES := libdl $(ADDRESS_SANITIZER_RUNTIME_LIBRARY)

ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan



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_LDLIBS_TARGET :=

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

# provides to Clang (for supporting features like -ftrapv).