From 7b7200727413ca4a9bb132221c543ec033dffafa Mon Sep 17 00:00:00 2001
|
From: Sergio Schvezov <sergio.schvezov@canonical.com>
|
Date: Wed, 7 Sep 2016 12:58:47 +0300
|
Subject: [PATCH] adb: remove selinux extensions
|
|
* drop useless includes of Android SELINUX extensions
|
* avoids having to clone another module
|
* this should be sent upstream
|
|
Upstream-Status: Inappropriate
|
|
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
|
---
|
adb/file_sync_service.c | 3 ---
|
1 file changed, 3 deletions(-)
|
|
diff --git a/adb/file_sync_service.c b/adb/file_sync_service.c
|
index 7933858516..3cbd0cd863 100644
|
--- a/adb/file_sync_service.c
|
+++ b/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 *path, uid_t uid,
|
if(fd >= 0) {
|
struct utimbuf u;
|
adb_close(fd);
|
- selinux_android_restorecon(path, 0);
|
u.actime = timestamp;
|
u.modtime = timestamp;
|
utime(path, &u);
|
