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/include/libbb.h b/include/libbb.h
index 0fdddfc..6531eb5 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -179,6 +179,11 @@
# define XTABS TAB3
#endif
+#if ANDROID_PLATFORM_SDK_VERSION >= 26 //8.0
+struct res_state;
+extern struct __res_state *__res_state(void);
+#define _res (*__res_state())
+#endif
/* Some libc's forget to declare these, do it ourself */