commit 08cca28f9215a840274a1b093b93bff8aaa6f33a
author Dan Albert <danalbert@google.com> Thu Dec 11 18:56:26 2014 -0800
committer Dan Albert <danalbert@google.com> Wed Apr 08 15:52:04 2015 -0700
tree 4e67466c83a7381bf8b9c0ca6b530ae422059752
parent b4b996a8ee26553e29f7610f97041753ddff3e68

Add support for ubsan.

Rather than adding LOCAL_UB_SANITIZER, LOCAL_THREAD_SANITIZER, etc for
each new sanitizer, deprecate LOCAL_ADDRESS_SANITIZER in favor of
LOCAL_SANITZE that mirrors the behavior of -fsanitize=<sanitizers>.

For example, the following will use both asan and ubsan:

    LOCAL_SANITIZE := address undefined

We'll leave LOCAL_ADDRESS_SANITIZER around for compatibility until we
can clean up the tree.

Change-Id: I8a62315129d4753f8e992584ca6db1e5dfdd4d2a

core/clang/config.mk

diff --git a/core/clang/config.mk b/core/clang/config.mk
index 13a5ba1..bdcfe60 100644
--- a/core/clang/config.mk
+++ b/core/clang/config.mk
@@ -115,7 +115,7 @@
 
 # Address sanitizer clang config
 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_CFLAGS := -fno-omit-frame-pointer
 ADDRESS_SANITIZER_CONFIG_EXTRA_LDFLAGS := -Wl,-u,__asan_preinit
 
 ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES := libdl $(ADDRESS_SANITIZER_RUNTIME_LIBRARY)