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/selinux/setfiles.c b/selinux/setfiles.c
index 0173db9..1c8ab89 100644
--- a/selinux/setfiles.c
+++ b/selinux/setfiles.c
@@ -651,6 +651,16 @@
argv++;
}
+#ifdef __BIONIC__
+ else {
+ const char *file_contexts = selinux_file_contexts_path();
+ /* Load the default file contexts configuration and check it. */
+ if (matchpathcon_init(file_contexts) < 0) {
+ bb_perror_msg_and_die("%s not found!", file_contexts);
+ }
+ }
+#endif
+
if (input_filename) {
ssize_t len;
FILE *f = stdin;