commit 9f8b5aaca8311c568686a3cb72df7ee07a381e65
author Dan Albert <danalbert@google.com> Tue Mar 17 18:52:10 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 17 18:52:10 2015 +0000
tree b5eb04d7957f65c05185dd60a281e96d379a6b1b
parent 648a352ab63cd2352191915c235a9a8b967fb84a
parent 0d3bf4beac7e30d47e3520e3b51b43f95cd7c219

am 0d3bf4be: Revert "Fix sepolicy-analyze libc++.so loading issue w/CTS."

* commit '0d3bf4beac7e30d47e3520e3b51b43f95cd7c219':
  Revert "Fix sepolicy-analyze libc++.so loading issue w/CTS."

tools/Android.mk

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

tools/sepolicy-analyze/Android.mk

diff --git a/tools/sepolicy-analyze/Android.mk b/tools/sepolicy-analyze/Android.mk
index b9ce0f4..e65efe9 100644
--- a/tools/sepolicy-analyze/Android.mk
+++ b/tools/sepolicy-analyze/Android.mk
@@ -9,6 +9,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
 
 include $(BUILD_HOST_EXECUTABLE)