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

Commit 63156752 authored by Evgeniy Stepanov's avatar Evgeniy Stepanov Committed by Android Git Automerger
Browse files

am cd092913: Merge "Don\'t pack ASAN executables." 

* commit 'cd092913':
  Don't pack ASAN executables.
parents 92d37d21 cd092913

core/config_sanitizers.mk

+7 −0
Original line number Diff line number Diff line
@@ -87,6 +87,13 @@ ifneq ($(filter address,$(my_sanitize)),) 
                           $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES)

    my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES)

    my_ldflags += -Wl,-rpath,$($(LOCAL_2ND_ARCH_VAR_PREFIX)ADDRESS_SANITIZER_RPATH)



    # http://b/20665974

    # The relocation packer is causing the kernel to load the executable

    # overlapping ASAN's shadow space.

    ifeq ($(LOCAL_MODULE_CLASS),EXECUTABLES)

        LOCAL_PACK_MODULE_RELOCATIONS := false

    endif

  endif

endif