diff options
| author | Dan Albert <danalbert@google.com> | 2015-03-17 17:32:14 +0000 |
|---|---|---|
| committer | Dan Albert <danalbert@google.com> | 2015-03-17 11:41:04 -0700 |
| commit | 0d3bf4beac7e30d47e3520e3b51b43f95cd7c219 (patch) | |
| tree | b5eb04d7957f65c05185dd60a281e96d379a6b1b /tools | |
| parent | f0852340af6bdd9b21b28ed2b79b89e115b398e6 (diff) | |
| download | android_external_sepolicy-0d3bf4beac7e30d47e3520e3b51b43f95cd7c219.tar.gz android_external_sepolicy-0d3bf4beac7e30d47e3520e3b51b43f95cd7c219.tar.bz2 android_external_sepolicy-0d3bf4beac7e30d47e3520e3b51b43f95cd7c219.zip | |
Revert "Fix sepolicy-analyze libc++.so loading issue w/CTS."
This is causing more harm than good. We'll just make these all link
libc++ again and work out the CTS issues if they still exist.
Bug: 19778891
This reverts commit 3812cf58cbf4e97006c172152de6aca209d185e9.
Change-Id: Iaea8f6acb147da4275633a760ccb32951db7f8b6
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Android.mk | 5 | ||||
| -rw-r--r-- | tools/sepolicy-analyze/Android.mk | 1 |
2 files changed, 1 insertions, 5 deletions
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_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))
\ No newline at end of file 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_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) |