From 0d3bf4beac7e30d47e3520e3b51b43f95cd7c219 Mon Sep 17 00:00:00 2001
From: Dan Albert <danalbert@google.com>
Date: Tue, 17 Mar 2015 17:32:14 +0000
Subject: [PATCH] Revert "Fix sepolicy-analyze libc++.so loading issue w/CTS."

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

Bug: 19778891

This reverts commit 3812cf58cbf4e97006c172152de6aca209d185e9.

Change-Id: Iaea8f6acb147da4275633a760ccb32951db7f8b6
---
 tools/Android.mk                  | 5 +----
 tools/sepolicy-analyze/Android.mk | 1 -
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/tools/Android.mk b/tools/Android.mk
index b9e3533c6..d749dd64c 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -8,7 +8,6 @@ LOCAL_C_INCLUDES := external/libsepol/include/
 LOCAL_CFLAGS := -DLINK_SEPOL_STATIC -Wall -Werror
 LOCAL_SRC_FILES := check_seapp.c
 LOCAL_STATIC_LIBRARIES := libsepol
-LOCAL_CXX_STL := none
 
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -22,7 +21,6 @@ LOCAL_C_INCLUDES := external/libsepol/include \
 LOCAL_CFLAGS := -Wall -Werror
 LOCAL_SRC_FILES := checkfc.c
 LOCAL_STATIC_LIBRARIES := libsepol libselinux
-LOCAL_CXX_STL := none
 
 include $(BUILD_HOST_EXECUTABLE)
 
@@ -45,8 +43,7 @@ LOCAL_C_INCLUDES := external/libsepol/include
 LOCAL_CFLAGS := -Wall -Werror
 LOCAL_SRC_FILES := sepolicy-check.c
 LOCAL_STATIC_LIBRARIES := libsepol
-LOCAL_CXX_STL := none
 
 include $(BUILD_HOST_EXECUTABLE)
 
-include $(call all-makefiles-under,$(LOCAL_PATH))
+include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
diff --git a/tools/sepolicy-analyze/Android.mk b/tools/sepolicy-analyze/Android.mk
index b9ce0f4f7..e65efe9ee 100644
--- a/tools/sepolicy-analyze/Android.mk
+++ b/tools/sepolicy-analyze/Android.mk
@@ -9,6 +9,5 @@ LOCAL_C_INCLUDES := external/libsepol/include
 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
 
 include $(BUILD_HOST_EXECUTABLE)
-- 
GitLab