summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--[-rwxr-xr-x]Android.mk40
-rw-r--r--android/android.c4
-rw-r--r--android/librpc/bindresvport.c3
-rw-r--r--android/selinux/android_selinux.h2
-rw-r--r--busybox-full.sources2
-rw-r--r--include/libbb.h5
-rw-r--r--selinux/sestatus.c11
-rw-r--r--shell/ash_80.c13601
8 files changed, 13665 insertions, 3 deletions
diff --git a/android/selinux/android_selinux.h b/android/selinux/android_selinux.h
index 8a0cfb0..949bcee 100644
--- a/android/selinux/android_selinux.h
+++ b/android/selinux/android_selinux.h
@@ -133,6 +133,7 @@ extern int selinux_check_passwd_access(access_vector_t requested);
#define selinux_policy_root() "/sepolicy"
+#if ANDROID_PLATFORM_SDK_VERSION < 26 //8.0
static int selinux_getenforcemode(int *rc)
{
if (rc) {
@@ -141,6 +142,7 @@ static int selinux_getenforcemode(int *rc)
}
return -1;
}
+#endif
static const char *selinux_file_contexts_path()
{