diff options
| author | Dan Albert <danalbert@google.com> | 2014-12-08 19:07:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-12-08 19:07:33 +0000 |
| commit | e98755f9d6619ff141d099f9da655d141da72b8e (patch) | |
| tree | 9c9e1bfcc90aedd6046b0ee34990c97c888f0788 /core/binary.mk | |
| parent | cd814343e897ae8b6d19874163eec8d89c6ae37f (diff) | |
| parent | 4ae5d4b331923ee837f0d6afd5605da0a49419c9 (diff) | |
| download | build-e98755f9d6619ff141d099f9da655d141da72b8e.zip build-e98755f9d6619ff141d099f9da655d141da72b8e.tar.gz build-e98755f9d6619ff141d099f9da655d141da72b8e.tar.bz2 | |
Merge "Add a SANITIZE_HOST flag."
Diffstat (limited to 'core/binary.mk')
| -rw-r--r-- | core/binary.mk | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/core/binary.mk b/core/binary.mk index 7fd7e32..752a5c3 100644 --- a/core/binary.mk +++ b/core/binary.mk @@ -191,19 +191,7 @@ $(foreach lib, $(LOCAL_HAL_STATIC_LIBRARIES), \ b_lib := endif -ifeq ($(strip $(LOCAL_ADDRESS_SANITIZER)),true) - my_clang := true - # Frame pointer based unwinder in ASan requires ARM frame setup. - LOCAL_ARM_MODE := arm - my_cflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_CFLAGS) - my_ldflags += $(ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS) - ifdef LOCAL_IS_HOST_MODULE - my_ldflags += -fsanitize=address - else - my_shared_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES) - my_static_libraries += $(ADDRESS_SANITIZER_CONFIG_EXTRA_STATIC_LIBRARIES) - endif -endif +include $(BUILD_SYSTEM)/config_sanitizers.mk ifeq ($(strip $($(LOCAL_2ND_ARCH_VAR_PREFIX)WITHOUT_$(my_prefix)CLANG)),true) my_clang := |