diff options
| author | dcashman <dcashman@google.com> | 2015-03-13 10:25:23 -0700 |
|---|---|---|
| committer | dcashman <dcashman@google.com> | 2015-05-14 09:07:48 -0700 |
| commit | ae6969440bcd1587b8df20e246d63329d17c0a75 (patch) | |
| tree | 8524b85d1e46bacec2a25c8fbd1f01e77bbceb50 /tools | |
| parent | b5dc766536088ff863e5178bf68b7564e47a3bb2 (diff) | |
| download | android_external_sepolicy-ae6969440bcd1587b8df20e246d63329d17c0a75.tar.gz android_external_sepolicy-ae6969440bcd1587b8df20e246d63329d17c0a75.tar.bz2 android_external_sepolicy-ae6969440bcd1587b8df20e246d63329d17c0a75.zip | |
Fix sepolicy-analyze libc++.so loading issue w/CTS.
Addresses the following error when running CTS on master:
junit.framework.AssertionFailedError: The following errors were encountered when validating the SELinuxneverallow rule:
neverallow { appdomain -bluetooth } self:capability *;
/tmp/SELinuxHostTest5593810182495331783.tmp: error while loading shared libraries: libc++.so: cannot open shared object file: No such file or directory
Also indicate that none of the sepolicy tools need c++ std lib.
(cherry-pick of 28acbeab18f6083299c07f9ebe769d22e49f8107)
Bug: 19566396
Change-Id: Ieb380d05ae896a8146b80f94fe3b3211178705bb
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Android.mk | 5 | ||||
| -rw-r--r-- | tools/sepolicy-analyze/Android.mk | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/Android.mk b/tools/Android.mk index d749dd6..b9e3533 100644 --- a/tools/Android.mk +++ b/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))
\ No newline at end of file +include $(call all-makefiles-under,$(LOCAL_PATH)) diff --git a/tools/sepolicy-analyze/Android.mk b/tools/sepolicy-analyze/Android.mk index e65efe9..b9ce0f4 100644 --- a/tools/sepolicy-analyze/Android.mk +++ b/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) |