am b8376873: am db38e7b5: Merge "Disable relocation packer in SANITIZE_TARGET mode."

* commit 'b837687362903dab10afbf76f5d387586a6e264f':
  Disable relocation packer in SANITIZE_TARGET mode.
This commit is contained in:
Evgenii Stepanov 2015-07-21 18:28:54 +00:00 committed by Android Git Automerger
commit 28c1081788

View file

@ -45,6 +45,10 @@ ifneq ($(strip $(SANITIZE_TARGET)),)
my_allow_undefined_symbols := true my_allow_undefined_symbols := true
endif endif
endif endif
# Workaround for a bug in AddressSanitizer that breaks stack unwinding.
# https://code.google.com/p/address-sanitizer/issues/detail?id=387
# Revert when external/compiler-rt is updated past r236014.
LOCAL_PACK_MODULE_RELOCATIONS := false
endif endif
endif endif