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

* commit '0d3bf4beac7e30d47e3520e3b51b43f95cd7c219':
  Revert "Fix sepolicy-analyze libc++.so loading issue w/CTS."
This commit is contained in:
Dan Albert 2015-03-17 18:52:10 +00:00 committed by Android Git Automerger
commit 9f8b5aaca8
2 changed files with 1 additions and 5 deletions

View file

@ -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))

View file

@ -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)