| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 354604da9d152f1931e91991d3f34197fc8fc759 Mon Sep 17 00:00:00 2001 |
| 2 | From: Sergio Schvezov <sergio.schvezov@canonical.com> |
| 3 | Date: Tue, 2 Oct 2018 16:36:54 +0000 |
| 4 | Subject: [PATCH] ext4_utils: remove selinux extensions |
| 5 | |
| 6 | * drop useless includes of Android SELINUX extensions |
| 7 | * avoids having to clone another module |
| 8 | * this should be sent upstream |
| 9 | |
| 10 | Upstream-Status: Inappropriate |
| 11 | --- |
| 12 | ext4_utils/make_ext4fs.c | 1 - |
| 13 | ext4_utils/make_ext4fs_main.c | 1 - |
| 14 | 2 files changed, 2 deletions(-) |
| 15 | |
| 16 | diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c |
| 17 | index 2f89ae8a0..732afbed7 100644 |
| 18 | --- a/ext4_utils/make_ext4fs.c |
| 19 | +++ b/ext4_utils/make_ext4fs.c |
| 20 | @@ -62,7 +62,6 @@ |
| 21 | |
| 22 | #include <selinux/selinux.h> |
| 23 | #include <selinux/label.h> |
| 24 | -#include <selinux/android.h> |
| 25 | |
| 26 | #define O_BINARY 0 |
| 27 | |
| 28 | diff --git a/ext4_utils/make_ext4fs_main.c b/ext4_utils/make_ext4fs_main.c |
| 29 | index a6c5f6160..f8e7b9da9 100644 |
| 30 | --- a/ext4_utils/make_ext4fs_main.c |
| 31 | +++ b/ext4_utils/make_ext4fs_main.c |
| 32 | @@ -32,7 +32,6 @@ |
| 33 | #ifndef USE_MINGW |
| 34 | #include <selinux/selinux.h> |
| 35 | #include <selinux/label.h> |
| 36 | -#include <selinux/android.h> |
| 37 | #else |
| 38 | struct selabel_handle; |
| 39 | #endif |