From 354604da9d152f1931e91991d3f34197fc8fc759 Mon Sep 17 00:00:00 2001
|
From: Sergio Schvezov <sergio.schvezov@canonical.com>
|
Date: Tue, 2 Oct 2018 16:36:54 +0000
|
Subject: [PATCH] ext4_utils: remove selinux extensions
|
|
* drop useless includes of Android SELINUX extensions
|
* avoids having to clone another module
|
* this should be sent upstream
|
|
Upstream-Status: Inappropriate
|
---
|
ext4_utils/make_ext4fs.c | 1 -
|
ext4_utils/make_ext4fs_main.c | 1 -
|
2 files changed, 2 deletions(-)
|
|
diff --git a/ext4_utils/make_ext4fs.c b/ext4_utils/make_ext4fs.c
|
index 2f89ae8a0..732afbed7 100644
|
--- a/ext4_utils/make_ext4fs.c
|
+++ b/ext4_utils/make_ext4fs.c
|
@@ -62,7 +62,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 a6c5f6160..f8e7b9da9 100644
|
--- a/ext4_utils/make_ext4fs_main.c
|
+++ b/ext4_utils/make_ext4fs_main.c
|
@@ -32,7 +32,6 @@
|
#ifndef USE_MINGW
|
#include <selinux/selinux.h>
|
#include <selinux/label.h>
|
-#include <selinux/android.h>
|
#else
|
struct selabel_handle;
|
#endif
|
