busybox: Clean up imports for 8.0

also hide some warnings

Change-Id: I8b6beb5ced175410a1bfae9db4dc46b271436a89
Signed-off-by: mydongistiny <[email protected]>

Author: mydongistiny

Android.mk

@@ -7,6 +7,9 @@ BB_PATH := $(LOCAL_PATH)
 BIONIC_ICS := false
 BIONIC_L := true
 
+BUSYBOX_WARNING_HIDE := -Wno-error=implicit-function-declaration -Wno-implicit-function-declaration -Wno-implicit-fallthrough \
+			-Wno-sign-compare -Wno-format-overflow -Wno-shift-negative-value -Wno-logical-not-parentheses -Wno-return-type
+
 # Make a static library for regex.
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := android/regex/bb_regex.c
@@ -20,7 +23,7 @@ include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(shell cat $(BB_PATH)/android/librpc.sources)
 LOCAL_C_INCLUDES := $(BB_PATH)/android/librpc
 LOCAL_MODULE := libuclibcrpc
-LOCAL_CFLAGS += -fno-strict-aliasing
+LOCAL_CFLAGS += -fno-strict-aliasing $(BUSYBOX_WARNING_HIDE)
 LOCAL_CLANG := false
 ifeq ($(BIONIC_L),true)
 LOCAL_CFLAGS += -DBIONIC_ICS -DBIONIC_L
@@ -102,11 +105,12 @@ BUSYBOX_C_INCLUDES = \
 	$(BB_PATH)/android/librpc
 
 BUSYBOX_CFLAGS = \
-	-Werror=implicit -Wno-clobbered \
+	-Wno-clobbered \
 	-DNDEBUG \
 	-DANDROID \
 	-fno-strict-aliasing \
 	-fno-builtin-stpcpy \
+	$(BUSYBOX_WARNING_HIDE) \
 	-include $(bb_gen)/$(BUSYBOX_CONFIG)/include/autoconf.h \
 	-D'CONFIG_DEFAULT_MODULES_DIR="$(KERNEL_MODULES_DIR)"' \
 	-D'BB_VER="$(strip $(shell $(SUBMAKE) kernelversion)) $(BUSYBOX_SUFFIX)"' -DBB_BT=AUTOCONF_TIMESTAMP

android/android.c

@@ -89,7 +89,7 @@ char *hasmntopt(const struct mntent *mnt, const char *opt)
 
 /* declared in grp.h, but not necessary */
 #if !ENABLE_USE_BB_PWD_GRP
-int setpwent() { return 0; }
+
 void setgrent() {}
 void endgrent() {}
 #endif

android/librpc/bindresvport.c

@@ -44,6 +44,7 @@ extern long __set_errno(int n);
 #endif
 #include <sys/socket.h>
 #include <netinet/in.h>
+#include <netdb.h>
 
 
 /*

android/selinux/android_selinux.h

@@ -133,15 +133,6 @@ extern int selinux_check_passwd_access(access_vector_t requested);
 
 #define selinux_policy_root() "/sepolicy"
 
-static int selinux_getenforcemode(int *rc)
-{
-	if (rc) {
-		*rc = security_getenforce();
-		return 0;
-	}
-	return -1;
-}
-
 static const char *selinux_file_contexts_path()
 {
 	return "/file_contexts";

android/selinux/android_selinux_internal.h

@@ -116,7 +116,6 @@ hidden_proto(selinux_mkload_policy)
     hidden_proto(selinux_usersconf_path);
 hidden_proto(selinux_translations_path);
 hidden_proto(selinux_colors_path);
-hidden_proto(selinux_getenforcemode);
 hidden_proto(selinux_getpolicytype);
 hidden_proto(selinux_raw_to_trans_context);
 hidden_proto(selinux_trans_to_raw_context);

networking/libiproute/iplink.c

@@ -9,6 +9,7 @@
 /*#include <net/if_packet.h> - not needed? */
 #include <netpacket/packet.h>
 #include <netinet/if_ether.h>
+#include <linux/if_ether.h>
 
 #include <linux/if_vlan.h>
 #include "ip_common.h"  /* #include "libbb.h" is inside */

networking/libiproute/ll_proto.c

@@ -13,6 +13,7 @@
 #include "utils.h"
 
 #include <netinet/if_ether.h>
+#include <linux/if_ether.h>
 
 /* Please conditionalize exotic protocols on CONFIG_something */
 

networking/nslookup.c

@@ -27,32 +27,27 @@
 
 #include <resolv.h>
 #include "libbb.h"
+#include <netdb.h>
 
 #ifdef ANDROID
 # include <netinet/in.h>
+# include <arpa/nameser.h>
+# include <dns/include/resolv_private.h>
+# include <dns/resolv/res_private.h>
 # if ENABLE_FEATURE_IPV6
 #  include <netinet/in6.h>
 # endif
-# define ANDROID_CHANGES
-# ifdef BIONIC_L
-#  include <arpa/nameser.h>
-#  include <dns/include/resolv_private.h>
-#  include <dns/resolv/res_private.h>
-# else
-#  include <arpa_nameser.h>
-#  include <private/resolv_private.h>
-#  include <netbsd/resolv/res_private.h>
-# endif
 
 static struct __res_state res_st;
 struct __res_state * __res_state(void)
 {
-	return &res_st;
+       return &res_st;
 }
-#endif
 
 #define EXT(res) ((&res)->_u._ext)
 
+# endif
+
 /*
  * I'm only implementing non-interactive mode;
  * I totally forgot nslookup even had an interactive mode.

selinux/sestatus.c

@@ -180,12 +180,6 @@ int sestatus_main(int argc UNUSED_PARAM, char **argv)
 	printf(COL_FMT "%s\n", "Current mode:",
 	       rc == 0 ? "permissive" : "enforcing");
 
-	/* Mode from config file: line */
-	if (selinux_getenforcemode(&rc) != 0)
-		goto error;
-	printf(COL_FMT "%s\n", "Mode from config file:",
-	       rc < 0 ? "disabled" : (rc == 0 ? "permissive" : "enforcing"));
-
 	/* Policy version: line */
 	rc = security_policyvers();
 	if (rc < 0)