| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 7b7200727413ca4a9bb132221c543ec033dffafa Mon Sep 17 00:00:00 2001 |
| 2 | From: Sergio Schvezov <sergio.schvezov@canonical.com> |
| 3 | Date: Wed, 7 Sep 2016 12:58:47 +0300 |
| 4 | Subject: [PATCH] adb: 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 | Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> |
| 13 | --- |
| 14 | adb/file_sync_service.c | 3 --- |
| 15 | 1 file changed, 3 deletions(-) |
| 16 | |
| 17 | diff --git a/adb/file_sync_service.c b/adb/file_sync_service.c |
| 18 | index 7933858516..3cbd0cd863 100644 |
| 19 | --- a/adb/file_sync_service.c |
| 20 | +++ b/adb/file_sync_service.c |
| 21 | @@ -26,7 +26,6 @@ |
| 22 | |
| 23 | #include <errno.h> |
| 24 | #include <private/android_filesystem_config.h> |
| 25 | -#include <selinux/android.h> |
| 26 | #include "sysdeps.h" |
| 27 | |
| 28 | #define TRACE_TAG TRACE_SYNC |
| 29 | @@ -73,7 +72,6 @@ static int mkdirs(char *name) |
| 30 | *x = '/'; |
| 31 | return ret; |
| 32 | } |
| 33 | - selinux_android_restorecon(name, 0); |
| 34 | } |
| 35 | *x++ = '/'; |
| 36 | } |
| 37 | @@ -251,7 +249,6 @@ static int handle_send_file(int s, char *path, uid_t uid, |
| 38 | if(fd >= 0) { |
| 39 | struct utimbuf u; |
| 40 | adb_close(fd); |
| 41 | - selinux_android_restorecon(path, 0); |
| 42 | u.actime = timestamp; |
| 43 | u.modtime = timestamp; |
| 44 | utime(path, &u); |