Skip to content
Snippets Groups Projects
Commit b8943b15 authored by dcashman's avatar dcashman Committed by Gerrit Code Review
Browse files

Merge "Fix sepolicy-analyze libc++.so loading issue w/CTS."

parents 421dadbc 28acbeab
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
tools/Android.mk
+ 4
− 1
View file @ b8943b15
...@@ -8,6 +8,7 @@ LOCAL_C_INCLUDES := external/libsepol/include/ ...@@ -8,6 +8,7 @@ LOCAL_C_INCLUDES := external/libsepol/include/
LOCAL_CFLAGS := -DLINK_SEPOL_STATIC -Wall -Werror LOCAL_CFLAGS := -DLINK_SEPOL_STATIC -Wall -Werror
LOCAL_SRC_FILES := check_seapp.c LOCAL_SRC_FILES := check_seapp.c
LOCAL_STATIC_LIBRARIES := libsepol LOCAL_STATIC_LIBRARIES := libsepol
LOCAL_CXX_STL := none
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
...@@ -21,6 +22,7 @@ LOCAL_C_INCLUDES := external/libsepol/include \ ...@@ -21,6 +22,7 @@ LOCAL_C_INCLUDES := external/libsepol/include \
LOCAL_CFLAGS := -Wall -Werror LOCAL_CFLAGS := -Wall -Werror
LOCAL_SRC_FILES := checkfc.c LOCAL_SRC_FILES := checkfc.c
LOCAL_STATIC_LIBRARIES := libsepol libselinux LOCAL_STATIC_LIBRARIES := libsepol libselinux
LOCAL_CXX_STL := none
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
...@@ -43,7 +45,8 @@ LOCAL_C_INCLUDES := external/libsepol/include ...@@ -43,7 +45,8 @@ LOCAL_C_INCLUDES := external/libsepol/include
LOCAL_CFLAGS := -Wall -Werror LOCAL_CFLAGS := -Wall -Werror
LOCAL_SRC_FILES := sepolicy-check.c LOCAL_SRC_FILES := sepolicy-check.c
LOCAL_STATIC_LIBRARIES := libsepol LOCAL_STATIC_LIBRARIES := libsepol
LOCAL_CXX_STL := none
include $(BUILD_HOST_EXECUTABLE) 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
+ 1
− 0
View file @ b8943b15
...@@ -9,5 +9,6 @@ LOCAL_C_INCLUDES := external/libsepol/include ...@@ -9,5 +9,6 @@ LOCAL_C_INCLUDES := external/libsepol/include
LOCAL_CFLAGS := -Wall -Werror 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_SRC_FILES := sepolicy-analyze.c dups.c neverallow.c perm.c typecmp.c booleans.c attribute.c utils.c
LOCAL_STATIC_LIBRARIES := libsepol LOCAL_STATIC_LIBRARIES := libsepol
LOCAL_CXX_STL := none
include $(BUILD_HOST_EXECUTABLE) include $(BUILD_HOST_EXECUTABLE)
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment