Merge "Disable relocation packer in SANITIZE_TARGET mode."

2015-07-21 17:30:02 +00:00 · 2015-07-21 17:30:02 +00:00 · db38e7b5d4
parent dd68e68fdd 4b396e47eb
commit db38e7b5d4
1 changed files with 4 additions and 0 deletions
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@ -45,6 +45,10 @@ ifneq ($(strip $(SANITIZE_TARGET)),)
        my_allow_undefined_symbols := true
      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