busybox: squashed commit of merging cm-12.1
With fixes to LOCAL_C_INCLUDES for libsepol in M and fixed
some missing includes to enable building for 64 bit devices
Conflicts:
Android.mk
android/libc/arch-x86/syscalls/swapoff.S
android/libc/arch-x86/syscalls/swapon.S
android/libc/arch-x86/syscalls/sysinfo.S
android/librpc/pmap_rmt.c
android/reboot.c
include-full/copy-current.sh
include-minimal/copy-current.sh
include/platform.h
networking/interface.c
networking/nslookup.c
Change-Id: If6092fa87f3d21190db1af4f70daa150eb462660
diff --git a/android/librpc/pmap_rmt.c b/android/librpc/pmap_rmt.c
index d6e576e..e4dbd44 100644
--- a/android/librpc/pmap_rmt.c
+++ b/android/librpc/pmap_rmt.c
@@ -59,8 +59,8 @@
#include <arpa/inet.h>
#define MAX_BROADCAST_SIZE 1400
-#ifdef ANDROID
-struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
+#if defined(ANDROID) && !defined(BIONIC_L)
+static struct in_addr inet_makeaddr(in_addr_t net, in_addr_t host)
{
struct in_addr a;
@@ -75,7 +75,7 @@
a.s_addr = htonl(a.s_addr);
return a;
}
-in_addr_t inet_netof(struct in_addr in)
+static in_addr_t inet_netof(struct in_addr in)
{
in_addr_t i = ntohl(in.s_addr);