Use new sanitizer option.
Forgot the other makefiles in the previous patch.
Change-Id: I83c3253531edd4002c294eb34701be8e0173367a
diff --git a/lib/asan/Android.mk b/lib/asan/Android.mk
index 92565a2..4b05e8c 100644
--- a/lib/asan/Android.mk
+++ b/lib/asan/Android.mk
@@ -139,7 +139,7 @@
LOCAL_CPP_EXTENSION := .cc
LOCAL_CLANG := true
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_STATIC_LIBRARY)
define build-asan-rt-shared-library
@@ -166,7 +166,7 @@
LOCAL_LDFLAGS += -Wl,-z,global
endif
LOCAL_CLANG := true
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
LOCAL_CXX_STL := none
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
include $(BUILD_SHARED_LIBRARY)
@@ -187,7 +187,7 @@
LOCAL_CPP_EXTENSION := .cc
LOCAL_CPPFLAGS := -std=c++11
LOCAL_SHARED_LIBRARIES += libc
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CXX_STL := libc++
@@ -216,7 +216,7 @@
LOCAL_SRC_FILES := tests/asan_noinst_test.cc tests/asan_test_main.cc
LOCAL_CPP_EXTENSION := .cc
LOCAL_CLANG := true
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CXX_STL := libc++
@@ -237,7 +237,7 @@
LOCAL_CPP_EXTENSION := .cc
LOCAL_STATIC_LIBRARIES := libgtest libasan_noinst_test
LOCAL_SHARED_LIBRARIES := libc
-LOCAL_ADDRESS_SANITIZER := true
+LOCAL_SANITIZE := address
LOCAL_CLANG := true
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
LOCAL_CXX_STL := libc++
@@ -259,7 +259,7 @@
LOCAL_CLANG := true
LOCAL_MULTILIB := both
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
LOCAL_WHOLE_STATIC_LIBRARIES := libubsan
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -272,7 +272,7 @@
LOCAL_CLANG := true
LOCAL_MULTILIB := both
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS)
@@ -298,7 +298,7 @@
LOCAL_CXX_STL := libc++
LOCAL_MULTILIB := both
LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_HOST_STATIC_LIBRARY)
include $(CLEAR_VARS)
@@ -312,7 +312,7 @@
LOCAL_SRC_FILES := $(asan_test_files)
LOCAL_CPP_EXTENSION := .cc
LOCAL_STATIC_LIBRARIES := libasan_noinst_test
-LOCAL_ADDRESS_SANITIZER := true
+LOCAL_SANITIZE := address
LOCAL_CLANG := true
LOCAL_CXX_STL := libc++
LOCAL_MULTILIB := both
diff --git a/lib/sanitizer_common/Android.mk b/lib/sanitizer_common/Android.mk
index 9436a43..8de06a2 100644
--- a/lib/sanitizer_common/Android.mk
+++ b/lib/sanitizer_common/Android.mk
@@ -84,7 +84,7 @@
LOCAL_CPPFLAGS := $(san_rtl_cppflags)
LOCAL_SRC_FILES := $(san_rtl_files) $(san_cdep_files)
LOCAL_CXX_STL := none
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)
diff --git a/lib/sanitizer_common/tests/Android.mk b/lib/sanitizer_common/tests/Android.mk
index 5c5a58f..f282ead 100644
--- a/lib/sanitizer_common/tests/Android.mk
+++ b/lib/sanitizer_common/tests/Android.mk
@@ -66,7 +66,7 @@
LOCAL_SRC_FILES := $(san_test_files)
LOCAL_STATIC_LIBRARIES := libsan
LOCAL_LDLIBS := -ldl
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_HOST_NATIVE_TEST)
include $(CLEAR_VARS)
@@ -78,7 +78,7 @@
LOCAL_STATIC_LIBRARIES := libsan libgtest_host
LOCAL_LDFLAGS := -nostdlib -Qunused-arguments
LOCAL_LDLIBS := -ldl
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
include $(BUILD_HOST_EXECUTABLE)
endif
diff --git a/lib/ubsan/Android.mk b/lib/ubsan/Android.mk
index 2df7fdd..8eb33f8 100644
--- a/lib/ubsan/Android.mk
+++ b/lib/ubsan/Android.mk
@@ -52,7 +52,7 @@
LOCAL_CPPFLAGS := $(ubsan_rtl_cppflags)
LOCAL_SRC_FILES := $(ubsan_rtl_files)
LOCAL_CXX_STL := none
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
LOCAL_MULTILIB := both
include $(BUILD_STATIC_LIBRARY)
@@ -70,7 +70,7 @@
LOCAL_CPPFLAGS := $(ubsan_rtl_cppflags) -fno-rtti
LOCAL_SRC_FILES := $(ubsan_rtl_files)
LOCAL_CXX_STL := none
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -82,7 +82,7 @@
LOCAL_SRC_FILES := $(ubsan_rtl_files)
LOCAL_WHOLE_STATIC_LIBRARIES := libsan
LOCAL_CXX_STL := none
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)
@@ -92,7 +92,7 @@
LOCAL_C_INCLUDES := $(ubsan_rtl_c_includes)
LOCAL_CPPFLAGS := $(ubsan_rtl_cppflags)
LOCAL_SRC_FILES := $(ubsan_cxx_rtl_files)
-LOCAL_ADDRESS_SANITIZER := false
+LOCAL_SANITIZE := never
LOCAL_MULTILIB := both
include $(BUILD_HOST_STATIC_LIBRARY)
