commit db38e7b5d407a438d05fc300b432cc83692643d8
author Evgenii Stepanov <eugenis@google.com> Tue Jul 21 17:30:02 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jul 21 17:30:03 2015 +0000
tree de70c98fea74e52e40972326c3cff40968e414fe
parent dd68e68fdd413fe93b78c648e2564c3c3c5e5cc3
parent 4b396e47eb141e8959038ff7159c4ce403ea9b7d

Merge "Disable relocation packer in SANITIZE_TARGET mode."

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index c28fff1..f71996d 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -45,6 +45,10 @@
         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