commit 08ef611b19f738ba38892642133843498a00fd14
author Evgenii Stepanov <eugenis@google.com> Tue Jul 21 18:39:14 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 21 18:39:14 2015 +0000
tree a35f675485be42eacc303ce2e09ef189bb6be4c1
parent c0e021d8226e1eae8e3d1bdcd2a4ea1face5bab4
parent 28c1081788c1861e552bfd2d93c3f6d83a0f8621

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

* commit '28c1081788c1861e552bfd2d93c3f6d83a0f8621':
  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