1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
|
Subject: drop useless includes of Android SELINUX extensions; avoids having to clone another module; this should be sent upstream
Author: Sergio Schvezov <sergio.schvezov@canonical.com>
Upstream-Status: Inappropriate
---
system/core/adb/file_sync_service.c | 3 ---
system/extras/ext4_utils/make_ext4fs.c | 1 -
system/extras/ext4_utils/make_ext4fs_main.c | 1 -
3 files changed, 5 deletions(-)
--- a/system/extras/ext4_utils/make_ext4fs.c
+++ b/system/extras/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
--- a/system/extras/ext4_utils/make_ext4fs_main.c
+++ b/system/extras/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
--- a/system/core/adb/file_sync_service.c
+++ b/system/core/adb/file_sync_service.c
@@ -26,7 +26,6 @@
#include <errno.h>
#include <private/android_filesystem_config.h>
-#include <selinux/android.h>
#include "sysdeps.h"
#define TRACE_TAG TRACE_SYNC
@@ -73,7 +72,6 @@ static int mkdirs(char *name)
*x = '/';
return ret;
}
- selinux_android_restorecon(name, 0);
}
*x++ = '/';
}
@@ -251,7 +249,6 @@ static int handle_send_file(int s, char
if(fd >= 0) {
struct utimbuf u;
adb_close(fd);
- selinux_android_restorecon(path, 0);
u.actime = timestamp;
u.modtime = timestamp;
utime(path, &u);
|
