am 3d9e31b5: am 3812cf58: Fix sepolicy-analyze libc++.so loading issue w/CTS.

* commit '3d9e31b5':
  Fix sepolicy-analyze libc++.so loading issue w/CTS.

tools/Android.mk

@@ -8,6 +8,7 @@ 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)
 
@@ -21,6 +22,7 @@ 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)
 
@@ -43,7 +45,8 @@ 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

tools/sepolicy-analyze/Android.mk

@@ -9,5 +9,6 @@ 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)