diff options
| author | Jeff Vander Stoep <jeffv@google.com> | 2015-06-10 21:05:13 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-10 21:05:14 +0000 |
| commit | bb6fa058895f5aafd025643b03b8ec6c778369f5 (patch) | |
| tree | 46a73f2987f0de6ff9e0cfe549ef2d59ad7230a9 | |
| parent | d31c4c3a363b3b4b0018d81c2bdbcb15a06e5007 (diff) | |
| parent | c28ca56319d72ac9f026689b5516c75f719900af (diff) | |
| download | extras-bb6fa058895f5aafd025643b03b8ec6c778369f5.tar.gz | |
Merge "Remove selinux/android.h from host tools" into mnc-dev
| -rw-r--r-- | ext4_utils/make_ext4fs.c | 1 | ||||
| -rw-r--r-- | ext4_utils/make_ext4fs_main.c | 2 | ||||
| -rw-r--r-- | f2fs_utils/f2fs_ioutils.c | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c index 5c9e2085..c089d255 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 diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c index 0e2ef5e5..f28e1b22 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 diff --git a/f2fs_utils/f2fs_ioutils.c b/f2fs_utils/f2fs_ioutils.c index f3b2a638..a050cf8f 100644 --- a/f2fs_utils/f2fs_ioutils.c +++ b/f2fs_utils/f2fs_ioutils.c @@ -78,7 +78,6 @@ struct selabel_handle; #include <selinux/selinux.h> #include <selinux/label.h> -#include <selinux/android.h> #define O_BINARY 0 |