Description: fix implicit declaration of stlcat/strlcopy functions.
Author: Fathi Boudra <fabo@debian.org>

Upstream-Status: Inappropriate
---
 system/core/adb/adb.c                |    1 +
 system/core/fs_mgr/fs_mgr_fstab.c    |    2 +-
 system/core/include/cutils/sockets.h |    2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

--- a/system/core/fs_mgr/fs_mgr_fstab.c
+++ b/system/core/fs_mgr/fs_mgr_fstab.c
@@ -17,7 +17,7 @@
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <string.h>
+#include <bsd/string.h>
 #include <sys/mount.h>
 
 #include "fs_mgr_priv.h"
--- a/system/core/include/cutils/sockets.h
+++ b/system/core/include/cutils/sockets.h
@@ -19,7 +19,7 @@
 
 #include <errno.h>
 #include <stdlib.h>
-#include <string.h>
+#include <bsd/string.h>
 #include <stdbool.h>
 
 #ifdef HAVE_WINSOCK
--- a/system/core/adb/adb.c
+++ b/system/core/adb/adb.c
@@ -41,6 +41,7 @@
 #include <sys/prctl.h>
 #include <getopt.h>
 #include <selinux/selinux.h>
+#include <grp.h>
 #else
 #include "usb_vendors.h"
 #endif