diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-20 22:42:11 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-20 22:42:11 +0000 |
| commit | 96983cba421434b2bee1230bbc809bb52d45e52d (patch) | |
| tree | a22046b4a94686130b35e109dccbe830f9a0ad1c /core | |
| parent | 66acb2a8ae0d41dc9cd6752b50059d8c8efc1b83 (diff) | |
| parent | cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2 (diff) | |
| download | build-96983cba421434b2bee1230bbc809bb52d45e52d.zip build-96983cba421434b2bee1230bbc809bb52d45e52d.tar.gz build-96983cba421434b2bee1230bbc809bb52d45e52d.tar.bz2 | |
am cc0aa4da: am 28c265dd: Merge "We also need -rdynamic for host ASAN."
* commit 'cc0aa4dabd4bae2b17bc9de8f88e04e862d030b2':
We also need -rdynamic for host ASAN.
Diffstat (limited to 'core')
| -rw-r--r-- | core/binary.mk | 2 | ||||
| -rw-r--r-- | core/clang/config.mk | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/binary.mk b/core/binary.mk index 8251143..4b545e9 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -184,12 +184,14 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true) my_cflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS) my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS) ifdef LOCAL_IS_HOST_MODULE + my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_HOST) my_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_HOST) my_shared_libraries += \ $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_HOST) my_static_libraries += \ $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_HOST) else + my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_TARGET) my_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET) my_shared_libraries += \ $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET) diff --git a/core/clang/config.mk b/core/clang/config.mk index 37eeae1..0027cbf 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -94,10 +94,12 @@ ADDRESS_SANITIZER_RUNTIME_LIBRARY := libclang_rt.asan_$(TARGET_ARCH)_android ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS := -fsanitize=address -fno-omit-frame-pointer ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit +ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_HOST := -rdynamic ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_HOST := -lpthread -ldl ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_HOST := ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_HOST := libasan +ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS_TARGET := ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET := ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET := libdl $(ADDRESS_SANITIZER_RUNTIME_LIBRARY) ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET := libasan |