From f0852340af6bdd9b21b28ed2b79b89e115b398e6 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 17 Mar 2015 17:29:23 +0000
Subject: [PATCH] Revert "Don't use address sanitizer for selinux tools."

This is causing more harm than good. We'll just make these all link
libc++ again (another revert) and work out the CTS issues if they still
exist.

Bug: 19778891

This reverts commit a5113a15009d5501e6ce5d14e781e0e691d80864.

Change-Id: I35a4c93dae4abb66e3525451d5ce01e33a540895
---
 tools/Android.mk                  | 3 ---
 tools/sepolicy-analyze/Android.mk | 1 -
 2 files changed, 4 deletions(-)

diff --git a/tools/Android.mk b/tools/Android.mk
index 96e29a3b8..b9e3533c6 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -9,7 +9,6 @@ LOCAL_CFLAGS := -DLINK_SEPOL_STATIC -Wall -Werror
 LOCAL_SRC_FILES := check_seapp.c
 LOCAL_STATIC_LIBRARIES := libsepol
 LOCAL_CXX_STL := none
-LOCAL_ADDRESS_SANITIZER := false
 
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -24,7 +23,6 @@ LOCAL_CFLAGS := -Wall -Werror
 LOCAL_SRC_FILES := checkfc.c
 LOCAL_STATIC_LIBRARIES := libsepol libselinux
 LOCAL_CXX_STL := none
-LOCAL_ADDRESS_SANITIZER := false
 
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -48,7 +46,6 @@ LOCAL_CFLAGS := -Wall -Werror
 LOCAL_SRC_FILES := sepolicy-check.c
 LOCAL_STATIC_LIBRARIES := libsepol
 LOCAL_CXX_STL := none
-LOCAL_ADDRESS_SANITIZER := false
 
 include $(BUILD_HOST_EXECUTABLE)
 
diff --git a/tools/sepolicy-analyze/Android.mk b/tools/sepolicy-analyze/Android.mk
index f13fbba5d..b9ce0f4f7 100644
--- a/tools/sepolicy-analyze/Android.mk
+++ b/tools/sepolicy-analyze/Android.mk
@@ -10,6 +10,5 @@ LOCAL_CFLAGS := -Wall -Werror
 LOCAL_SRC_FILES := sepolicy-analyze.c dups.c neverallow.c perm.c typecmp.c booleans.c attribute.c utils.c
 LOCAL_STATIC_LIBRARIES := libsepol
 LOCAL_CXX_STL := none
-LOCAL_ADDRESS_SANITIZER := false
 
 include $(BUILD_HOST_EXECUTABLE)
-- 
GitLab