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
diff --git a/tools/Android.mk b/tools/Android.mk
index b9e3533..d749dd6 100644
--- a/tools/Android.mk
+++ b/tools/Android.mk
@@ -8,7 +8,6 @@
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_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_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