diff options
| author | Evgenii Stepanov <eugenis@google.com> | 2016-07-01 00:42:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-07-01 00:42:12 +0000 |
| commit | 24dc27e643c631e76bc034775481928dd89be5e9 (patch) | |
| tree | f1a28be7836c2a43986b7f0205b8926beaa2b8b6 | |
| parent | 3d8ee8896b39e0b1cd9e780a26d92dd6aec4b5ea (diff) | |
| parent | 912b51f8abc1947c81a0cfbe2d8951751fdf85c6 (diff) | |
| download | build-24dc27e643c631e76bc034775481928dd89be5e9.tar.gz | |
Merge "Sanitizer build tweaks."
| -rw-r--r-- | core/config_sanitizers.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/core/config_sanitizers.mk b/core/config_sanitizers.mk index 6b18be516f..b69a6ce20b 100644 --- a/core/config_sanitizers.mk +++ b/core/config_sanitizers.mk @@ -55,17 +55,13 @@ endif # 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 |