commit c28ca56319d72ac9f026689b5516c75f719900af
author Jeff Vander Stoep <jeffv@google.com> Wed May 13 14:29:15 2015 -0700
committer Jeff Vander Stoep <jeffv@google.com> Wed Jun 10 13:47:47 2015 -0700
tree 2cb51651a1cf501be03709d65bb0565b57d1a600
parent 643233ded9075628010c16feb8d2401ade3ae62c

Remove selinux/android.h from host tools

For tools built for both host and device, only include if not host.

(cherry-picked from commit 6bc4a54fdbd926c032ed5c99f8b5c69f624c6312)

Change-Id: Ie102bd7575d2cf5eef3f95e6063c2970d143dac8

ext4_utils/make_ext4fs.c

diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
index 5c9e208..c089d25 100644
--- a/ext4_utils/make_ext4fs.c
+++ b/ext4_utils/make_ext4fs.c
@@ -61,7 +61,6 @@
 
 #include <selinux/selinux.h>
 #include <selinux/label.h>
-#include <selinux/android.h>
 
 #define O_BINARY 0
 

ext4_utils/make_ext4fs_main.c

diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c
index 0e2ef5e..f28e1b2 100644
--- a/ext4_utils/make_ext4fs_main.c
+++ b/ext4_utils/make_ext4fs_main.c
@@ -32,7 +32,9 @@
 #ifndef USE_MINGW
 #include <selinux/selinux.h>
 #include <selinux/label.h>
+#if !defined(HOST)
 #include <selinux/android.h>
+#endif
 #else
 struct selabel_handle;
 #endif

f2fs_utils/f2fs_ioutils.c

diff --git a/f2fs_utils/f2fs_ioutils.c b/f2fs_utils/f2fs_ioutils.c
index f3b2a63..a050cf8 100644
--- a/f2fs_utils/f2fs_ioutils.c
+++ b/f2fs_utils/f2fs_ioutils.c
@@ -78,7 +78,6 @@
 
 #include <selinux/selinux.h>
 #include <selinux/label.h>
-#include <selinux/android.h>
 
 #define O_BINARY 0