commit 27116babeb4b68f6da9628f32b17251141c24cdb
author maxwen <max.weninger@gmail.com> Fri Aug 14 21:41:28 2015 +0200
committer Ethan Yonker <dees_troy@teamw.in> Thu Oct 15 14:54:06 2015 -0500
tree 6880bf3c93c160c176ba7b1706436f2ed90f06b4
parent cd3f398fa3715f3fd0850b2b26d660595dc7e7cd

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

selinux/runcon.c

diff --git a/selinux/runcon.c b/selinux/runcon.c
index 27f2be3..60d4100 100644
--- a/selinux/runcon.c
+++ b/selinux/runcon.c
@@ -30,8 +30,8 @@
  */
 
 //usage:#define runcon_trivial_usage
-//usage:       "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] PROG ARGS\n"
-//usage:       "runcon CONTEXT PROG ARGS"
+//usage:       "[-c] [-u USER] [-r ROLE] [-t TYPE] [-l RANGE] PROG -- ARGS\n"
+//usage:       "runcon CONTEXT PROG -- ARGS"
 //usage:#define runcon_full_usage "\n\n"
 //usage:       "Run PROG in a different security context\n"
 //usage:     "\n	CONTEXT		Complete security context\n"
@@ -51,7 +51,9 @@
 //usage:	)
 
 #include <selinux/context.h>
+#ifndef ANDROID
 #include <selinux/flask.h>
+#endif
 
 #include "libbb.h"