diff options
| author | Dan Albert <danalbert@google.com> | 2014-10-20 13:37:18 -0700 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2014-10-20 13:37:18 -0700 |
| commit | 66acb2a8ae0d41dc9cd6752b50059d8c8efc1b83 (patch) | |
| tree | c90b5aae68159b2416f862f7beb4e17c3eb61390 /core | |
| parent | 554e514c21653d3973d79c4e59d14b21dab42b47 (diff) | |
| parent | 96c22133af53974a8e55412840338c2e29140298 (diff) | |
| download | build-66acb2a8ae0d41dc9cd6752b50059d8c8efc1b83.zip build-66acb2a8ae0d41dc9cd6752b50059d8c8efc1b83.tar.gz build-66acb2a8ae0d41dc9cd6752b50059d8c8efc1b83.tar.bz2 | |
resolved conflicts for merge of 96c22133 to lmp-dev-plus-aosp
Change-Id: I35a2f403e9e664536b45b5ac9185adf1e1a02442
Diffstat (limited to 'core')
| -rw-r--r-- | core/binary.mk | 15 | ||||
| -rw-r--r-- | core/clang/config.mk | 10 |
2 files changed, 21 insertions, 4 deletions
diff --git a/core/binary.mk b/core/binary.mk index 10840b4..8251143 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -183,8 +183,19 @@ ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true) LOCAL_ARM_MODE := arm my_cflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS) my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS) - my_shared_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES) - my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES) + ifdef LOCAL_IS_HOST_MODULE + 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_ldlibs += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDLIBS_TARGET) + my_shared_libraries += \ + $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET) + my_static_libraries += \ + $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET) + endif endif ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true) diff --git a/core/clang/config.mk b/core/clang/config.mk index d07df70..37eeae1 100644 --- a/core/clang/config.mk +++ b/core/clang/config.mk @@ -93,8 +93,14 @@ endif 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_SHARED_LIBRARIES := libdl $(ADDRESS_SANITIZER_RUNTIME_LIBRARY) -ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES := libasan + +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_LDLIBS_TARGET := +ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES_TARGET := libdl $(ADDRESS_SANITIZER_RUNTIME_LIBRARY) +ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES_TARGET := libasan # This allows us to use the superset of functionality that compiler-rt # provides to Clang (for supporting features like -ftrapv). |