commit bd9f3f61875dcadbc3e4b71ab03bcaef7da377cb
author Evgenii Stepanov <eugenis@google.com> Fri Jul 01 00:47:39 2016 +0000
committer android-build-merger <android-build-merger@google.com> Fri Jul 01 00:47:39 2016 +0000
tree 648263133203bb01f99ff48a1890650d162ec76b
parent 2890414f7829505e1edca4bea86ae9ad1d9122fa
parent 24dc27e643c631e76bc034775481928dd89be5e9

Merge \"Sanitizer build tweaks.\"
am: 24dc27e643

Change-Id: I351ba996ee3ed77f6400e48149c972e271476a8f

core/config_sanitizers.mk

diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk
index 6b18be5..b69a6ce 100644
--- a/core/config_sanitizers.mk
+++ b/core/config_sanitizers.mk
@@ -55,17 +55,13 @@
 # sanitized static libraries. That's OK, because the executable
 # always depends on the ASan runtime library, which defines these
 # symbols.
-ifneq ($(strip $(SANITIZE_TARGET)),)
+ifneq ($(filter address thread,$(strip $(SANITIZE_TARGET))),)
   ifndef LOCAL_IS_HOST_MODULE
     ifeq ($(LOCAL_MODULE_CLASS),SHARED_LIBRARIES)
       ifeq ($(my_sanitize),)
         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