commit b837687362903dab10afbf76f5d387586a6e264f
author Evgenii Stepanov <eugenis@google.com> Tue Jul 21 17:44:47 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Jul 21 17:44:47 2015 +0000
tree d6618cefb603debd80f89a5192b54ce9a9357e09
parent a04e6b89ec262f4dd38c9d80ee05ce313bab9347
parent db38e7b5d407a438d05fc300b432cc83692643d8

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

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